Ingo,
Ingo,
I removed many extra whitespaces and tabs from arch/x86/kernel/
$ git-shortlog
Gustavo F. Padovan (24):
x86: kernel/alternative.c cleanup
x86: kernel/apm_32.c cleanup
x86: kernel/asm-offsets_64.c cleanup
x86: kernel/efi.c cleanup
x86: kernel/cpuid.c cleanup
x86: kernel/early-quirks.c cleanup
x86: kernel/io_apic_32.c cleanup
x86: kernel/io_apic_64.c cleanup
x86: kernel/irq_64.c cleanup
x86: kernel/irqinit_32.c cleanup
x86: kernel/kprobes.c cleanup
x86: kernel/microcode.c cleanup
x86: kernel/module_64.c cleanup
x86: kernel/pci-calgary_64.c cleanup
x86: kernel/probe_roms_32.c cleanup
x86: kernel/process_32.c cleanup
x86: kernel/process_64.c cleanup
x86: kernel/signal_64.c cleanup
x86: kernel/traps_64.c cleanup
x86: kernel/tsc.c cleanup
x86: kernel/visws_quirks.c cleanup
x86: kernel/vmi_32.c cleanup
x86: kernel/vmiclock_32.c cleanup
x86: kernel/sys_x86_64.c cleanup
Remove additional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/alternative.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 2763cb3..f5c48c4 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -458,7 +458,7 @@ void __init alternative_instructions(void)
alternatives_smp_switch(0);
}
#endif
- apply_paravirt(__parainstructions, __parainstructions_end);
+ apply_paravirt(__parainstructions, __parainstructions_end);
if (smp_alt_once)
free_init_pages("SMP alternatives",
--
1.5.4.5
Remove additional whitespaces and tabs.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/apm_32.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 9ee24e6..b0c049c 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -435,7 +435,7 @@ static const char * const apm_event_name[] = {
typedef struct lookup_t {
int key;
- char *msg;
+ char *msg;
} lookup_t;
/*
@@ -1679,8 +1679,8 @@ static int apm(void *unused)
unsigned short cx;
unsigned short dx;
int error;
- char *power_stat;
- char *bat_stat;
+ char *power_stat;
+ char *bat_stat;
#ifdef CONFIG_SMP
/* 2002/08/01 - WT
--
1.5.4.5
Remove additional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/asm-offsets_64.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
index aa89387..72d1f6c 100644
--- a/arch/x86/kernel/asm-offsets_64.c
+++ b/arch/x86/kernel/asm-offsets_64.c
@@ -5,9 +5,9 @@
*/
#include <linux/crypto.h>
-#include <linux/sched.h>
+#include <linux/sched.h>
#include <linux/stddef.h>
-#include <linux/errno.h>
+#include <linux/errno.h>
#include <linux/hardirq.h>
#include <linux/suspend.h>
#include <linux/kbuild.h>
@@ -32,7 +32,7 @@ int main(void)
{
#define ENTRY(entry) DEFINE(tsk_ ## entry, offsetof(struct task_struct, entry))
ENTRY(state);
- ENTRY(flags);
+ ENTRY(flags);
ENTRY(pid);
BLANK();
#undef ENTRY
@@ -47,9 +47,9 @@ int main(void)
BLANK();
#undef ENTRY
#define ENTRY(entry) DEFINE(pda_ ## entry, offsetof(struct x8664_pda, entry))
- ENTRY(kernelstack);
- ENTRY(oldrsp);
- ENTRY(pcurrent);
+ ENTRY(kernelstack);
+ ENTRY(oldrsp);
+ ENTRY(pcurrent);
ENTRY(irqcount);
ENTRY(cpunumber);
ENTRY(irqstackptr);
--
1.5.4.5
Remove additional whitespaces and tabs.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/efi.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/efi.c b/arch/x86/kernel/efi.c
index 06cc8d4..9fb2959 100644
--- a/arch/x86/kernel/efi.c
+++ b/arch/x86/kernel/efi.c
@@ -44,7 +44,7 @@
#include <asm/tlbflush.h>
#define EFI_DEBUG 1
-#define PFX "EFI: "
+#define PFX "EFI: "
int efi_enabled;
EXPORT_SYMBOL(efi_enabled);
@@ -184,9 +184,9 @@ static efi_status_t __init phys_efi_get_time(efi_time_t *tm,
int efi_set_rtc_mmss(unsigned long nowtime)
{
int real_seconds, real_minutes;
- efi_status_t status;
- efi_time_t eft;
- efi_time_cap_t cap;
+ efi_status_t status;
+ efi_time_t eft;
+ efi_time_cap_t cap;
status = efi.get_time(&eft, &cap);
if (status != EFI_SUCCESS) {
--
1.5.4.5
Remove additional tab.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/cpuid.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
index 14b11b3..6595733 100644
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
@@ -111,7 +111,7 @@ static int cpuid_open(struct inode *inode, struct file *file)
unsigned int cpu;
struct cpuinfo_x86 *c;
int ret = 0;
-
+
lock_kernel();
cpu = iminor(file->f_path.dentry->d_inode);
--
1.5.4.5
Remove additional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/early-quirks.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 4353cf5..3af4ec9 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -95,7 +95,7 @@ static void __init nvidia_bugs(int num, int slot, int func)
}
-#define QFLAG_APPLY_ONCE 0x1
+#define QFLAG_APPLY_ONCE 0x1
#define QFLAG_APPLIED 0x2
#define QFLAG_DONE (QFLAG_APPLY_ONCE|QFLAG_APPLIED)
struct chipset {
--
1.5.4.5
Remove additional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/io_apic_32.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/io_apic_32.c b/arch/x86/kernel/io_apic_32.c
index de9aa0e..5801233 100644
--- a/arch/x86/kernel/io_apic_32.c
+++ b/arch/x86/kernel/io_apic_32.c
@@ -389,7 +389,7 @@ static struct irq_cpu_info {
#define CPU_IRQ(cpu) (irq_cpu_data[cpu].irq)
#define LAST_CPU_IRQ(cpu, irq) (irq_cpu_data[cpu].last_irq[irq])
-#define IRQ_DELTA(cpu, irq) (irq_cpu_data[cpu].irq_delta[irq])
+#define IRQ_DELTA(cpu, irq) (irq_cpu_data[cpu].irq_delta[irq])
#define IDLE_ENOUGH(cpu,now) \
(idle_cpu(cpu) && ((now) - per_cpu(irq_stat, (cpu)).idle_timestamp > 1))
@@ -1972,14 +1972,14 @@ static int ioapic_retrigger_irq(unsigned int irq)
}
static struct irq_chip ioapic_chip __read_mostly = {
- .name = "IO-APIC",
- .startup = startup_ioapic_irq,
- .mask = mask_IO_APIC_irq,
- .unmask = unmask_IO_APIC_irq,
- .ack = ack_ioapic_irq,
- .eoi = ack_ioapic_quirk_irq,
+ .name = "IO-APIC",
+ .startup = startup_ioapic_irq,
+ .mask = mask_IO_APIC_irq,
+ .unmask = unmask_IO_APIC_irq,
+ .ack = ack_ioapic_irq,
+ .eoi = ack_ioapic_quirk_irq,
#ifdef CONFIG_SMP
- .set_affinity = set_ioapic_affinity_irq,
+ .set_affinity = set_ioapic_affinity_irq,
#endif
.retrigger = ioapic_retrigger_irq,
};
--
1.5.4.5
Remove additional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/io_apic_64.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index 8269434..f2f1825 100644
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -1510,14 +1510,14 @@ static void ack_apic_level(unsigned int irq)
}
static struct irq_chip ioapic_chip __read_mostly = {
- .name = "IO-APIC",
- .startup = startup_ioapic_irq,
- .mask = mask_IO_APIC_irq,
- .unmask = unmask_IO_APIC_irq,
- .ack = ack_apic_edge,
- .eoi = ack_apic_level,
+ .name = "IO-APIC",
+ .startup = startup_ioapic_irq,
+ .mask = mask_IO_APIC_irq,
+ .unmask = unmask_IO_APIC_irq,
+ .ack = ack_apic_edge,
+ .eoi = ack_apic_level,
#ifdef CONFIG_SMP
- .set_affinity = set_ioapic_affinity_irq,
+ .set_affinity = set_ioapic_affinity_irq,
#endif
.retrigger = ioapic_retrigger_irq,
};
@@ -1591,14 +1591,14 @@ static void lapic_register_intr(int irq)
static void __init setup_nmi(void)
{
/*
- * Dirty trick to enable the NMI watchdog ...
+ * Dirty trick to enable the NMI watchdog ...
* We put the 8259A master into AEOI mode and
* unmask on all local APICs LVT0 as NMI.
*
* The idea to use the 8259A in AEOI mode ('8259A Virtual Wire')
* is from Maciej W. Rozycki - so we do not have to EOI from
* the NMI handler or the timer interrupt.
- */
+ */
printk(KERN_INFO "activating NMI Watchdog ...");
enable_NMI_through_LVT0();
--
1.5.4.5
Remove additional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/irq_64.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
index 1f78b23..63c7b8a 100644
--- a/arch/x86/kernel/irq_64.c
+++ b/arch/x86/kernel/irq_64.c
@@ -277,18 +277,18 @@ extern void call_softirq(void);
asmlinkage void do_softirq(void)
{
- __u32 pending;
- unsigned long flags;
+ __u32 pending;
+ unsigned long flags;
- if (in_interrupt())
- return;
+ if (in_interrupt())
+ return;
- local_irq_save(flags);
- pending = local_softirq_pending();
- /* Switch to interrupt stack */
- if (pending) {
+ local_irq_save(flags);
+ pending = local_softirq_pending();
+ /* Switch to interrupt stack */
+ if (pending) {
call_softirq();
WARN_ON_ONCE(softirq_count());
}
- local_irq_restore(flags);
+ local_irq_restore(flags);
}
--
1.5.4.5
Remove additional tab.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/irqinit_32.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c
index d669142..ea55e12 100644
--- a/arch/x86/kernel/irqinit_32.c
+++ b/arch/x86/kernel/irqinit_32.c
@@ -34,7 +34,7 @@
* leads to races. IBM designers who came up with it should
* be shot.
*/
-
+
static irqreturn_t math_error_irq(int cpl, void *dev_id)
{
--
1.5.4.5
Remove additional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/kprobes.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index 6c27679..d3190dc 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -30,14 +30,14 @@
* <[email protected]> and Prasanna S Panchamukhi
* <[email protected]> added function-return probes.
* 2005-May Rusty Lynch <[email protected]>
- * Added function return probes functionality
+ * Added function return probes functionality
* 2006-Feb Masami Hiramatsu <[email protected]> added
- * kprobe-booster and kretprobe-booster for i386.
+ * kprobe-booster and kretprobe-booster for i386.
* 2007-Dec Masami Hiramatsu <[email protected]> added kprobe-booster
- * and kretprobe-booster for x86-64
+ * and kretprobe-booster for x86-64
* 2007-Dec Masami Hiramatsu <[email protected]>, Arjan van de Ven
- * <[email protected]> and Jim Keniston <[email protected]>
- * unified x86 kprobes code.
+ * <[email protected]> and Jim Keniston <[email protected]>
+ * unified x86 kprobes code.
*/
#include <linux/kprobes.h>
--
1.5.4.5
Remove additional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/microcode.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/microcode.c b/arch/x86/kernel/microcode.c
index 6994c75..24a82ea 100644
--- a/arch/x86/kernel/microcode.c
+++ b/arch/x86/kernel/microcode.c
@@ -98,10 +98,10 @@ MODULE_DESCRIPTION("Intel CPU (IA-32) Microcode Update Driver");
MODULE_AUTHOR("Tigran Aivazian <[email protected]>");
MODULE_LICENSE("GPL");
-#define MICROCODE_VERSION "1.14a"
+#define MICROCODE_VERSION "1.14a"
-#define DEFAULT_UCODE_DATASIZE (2000) /* 2000 bytes */
-#define MC_HEADER_SIZE (sizeof (microcode_header_t)) /* 48 bytes */
+#define DEFAULT_UCODE_DATASIZE (2000) /* 2000 bytes */
+#define MC_HEADER_SIZE (sizeof (microcode_header_t)) /* 48 bytes */
#define DEFAULT_UCODE_TOTALSIZE (DEFAULT_UCODE_DATASIZE + MC_HEADER_SIZE) /* 2048 bytes */
#define EXT_HEADER_SIZE (sizeof (struct extended_sigtable)) /* 20 bytes */
#define EXT_SIGNATURE_SIZE (sizeof (struct extended_signature)) /* 12 bytes */
--
1.5.4.5
Remove additional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/module_64.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kernel/module_64.c b/arch/x86/kernel/module_64.c
index 6ba8783..9aacadc 100644
--- a/arch/x86/kernel/module_64.c
+++ b/arch/x86/kernel/module_64.c
@@ -30,7 +30,7 @@
#include <asm/page.h>
#include <asm/pgtable.h>
-#define DEBUGP(fmt...)
+#define DEBUGP(fmt...)
#ifndef CONFIG_UML
void module_free(struct module *mod, void *module_region)
@@ -77,7 +77,7 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
Elf64_Rela *rel = (void *)sechdrs[relsec].sh_addr;
Elf64_Sym *sym;
void *loc;
- u64 val;
+ u64 val;
DEBUGP("Applying relocate section %u to %u\n", relsec,
sechdrs[relsec].sh_info);
@@ -92,10 +92,10 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
+ ELF64_R_SYM(rel[i].r_info);
DEBUGP("type %d st_value %Lx r_addend %Lx loc %Lx\n",
- (int)ELF64_R_TYPE(rel[i].r_info),
+ (int)ELF64_R_TYPE(rel[i].r_info),
sym->st_value, rel[i].r_addend, (u64)loc);
- val = sym->st_value + rel[i].r_addend;
+ val = sym->st_value + rel[i].r_addend;
switch (ELF64_R_TYPE(rel[i].r_info)) {
case R_X86_64_NONE:
@@ -113,12 +113,12 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
if ((s64)val != *(s32 *)loc)
goto overflow;
break;
- case R_X86_64_PC32:
+ case R_X86_64_PC32:
val -= (u64)loc;
*(u32 *)loc = val;
#if 0
if ((s64)val != *(s32 *)loc)
- goto overflow;
+ goto overflow;
#endif
break;
default:
@@ -130,7 +130,7 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
return 0;
overflow:
- printk(KERN_ERR "overflow in relocation type %d val %Lx\n",
+ printk(KERN_ERR "overflow in relocation type %d val %Lx\n",
(int)ELF64_R_TYPE(rel[i].r_info), val);
printk(KERN_ERR "`%s' likely not compiled with -mcmodel=kernel\n",
me->name);
@@ -145,7 +145,7 @@ int apply_relocate(Elf_Shdr *sechdrs,
{
printk("non add relocation not supported\n");
return -ENOSYS;
-}
+}
int module_finalize(const Elf_Ehdr *hdr,
const Elf_Shdr *sechdrs,
--
1.5.4.5
Remove additional tab.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/pci-calgary_64.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
index b67a4b1..1bed35a 100644
--- a/arch/x86/kernel/pci-calgary_64.c
+++ b/arch/x86/kernel/pci-calgary_64.c
@@ -854,7 +854,7 @@ static void __init calgary_free_bus(struct pci_dev *dev)
tbl->it_map = NULL;
kfree(tbl);
-
+
set_pci_iommu(dev->bus, NULL);
/* Can't free bootmem allocated memory after system is up :-( */
--
1.5.4.5
Remove additional tab.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/process_32.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 53bc653..1fe67f5 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -288,7 +288,7 @@ void flush_thread(void)
tsk->thread.debugreg3 = 0;
tsk->thread.debugreg6 = 0;
tsk->thread.debugreg7 = 0;
- memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
+ memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
clear_tsk_thread_flag(tsk, TIF_DEBUG);
/*
* Forget coprocessor state..
--
1.5.4.5
Remove additional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/probe_roms_32.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kernel/probe_roms_32.c b/arch/x86/kernel/probe_roms_32.c
index 675a48c..00ff4fa 100644
--- a/arch/x86/kernel/probe_roms_32.c
+++ b/arch/x86/kernel/probe_roms_32.c
@@ -35,39 +35,39 @@ static struct resource extension_rom_resource = {
};
static struct resource adapter_rom_resources[] = { {
- .name = "Adapter ROM",
+ .name = "Adapter ROM",
.start = 0xc8000,
.end = 0,
.flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
}, {
- .name = "Adapter ROM",
+ .name = "Adapter ROM",
.start = 0,
.end = 0,
.flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
}, {
- .name = "Adapter ROM",
+ .name = "Adapter ROM",
.start = 0,
.end = 0,
.flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
}, {
- .name = "Adapter ROM",
+ .name = "Adapter ROM",
.start = 0,
.end = 0,
.flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
}, {
- .name = "Adapter ROM",
+ .name = "Adapter ROM",
.start = 0,
.end = 0,
.flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
}, {
- .name = "Adapter ROM",
+ .name = "Adapter ROM",
.start = 0,
.end = 0,
.flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
} };
static struct resource video_rom_resource = {
- .name = "Video ROM",
+ .name = "Video ROM",
.start = 0xc0000,
.end = 0xc7fff,
.flags = IORESOURCE_BUSY | IORESOURCE_READONLY | IORESOURCE_MEM
--
1.5.4.5
Remove additional whitespaces and tabs.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/process_64.c | 78 +++++++++++++++++++++---------------------
1 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 3fb62a7..ea31c20 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -177,28 +177,28 @@ void __show_regs(struct pt_regs * regs)
printk("RBP: %016lx R08: %016lx R09: %016lx\n",
regs->bp, regs->r8, regs->r9);
printk("R10: %016lx R11: %016lx R12: %016lx\n",
- regs->r10, regs->r11, regs->r12);
+ regs->r10, regs->r11, regs->r12);
printk("R13: %016lx R14: %016lx R15: %016lx\n",
- regs->r13, regs->r14, regs->r15);
+ regs->r13, regs->r14, regs->r15);
- asm("movl %%ds,%0" : "=r" (ds));
- asm("movl %%cs,%0" : "=r" (cs));
- asm("movl %%es,%0" : "=r" (es));
+ asm("movl %%ds,%0" : "=r" (ds));
+ asm("movl %%cs,%0" : "=r" (cs));
+ asm("movl %%es,%0" : "=r" (es));
asm("movl %%fs,%0" : "=r" (fsindex));
asm("movl %%gs,%0" : "=r" (gsindex));
rdmsrl(MSR_FS_BASE, fs);
- rdmsrl(MSR_GS_BASE, gs);
- rdmsrl(MSR_KERNEL_GS_BASE, shadowgs);
+ rdmsrl(MSR_GS_BASE, gs);
+ rdmsrl(MSR_KERNEL_GS_BASE, shadowgs);
cr0 = read_cr0();
cr2 = read_cr2();
cr3 = read_cr3();
cr4 = read_cr4();
- printk("FS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n",
- fs,fsindex,gs,gsindex,shadowgs);
- printk("CS: %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds, es, cr0);
+ printk("FS: %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n",
+ fs,fsindex,gs,gsindex,shadowgs);
+ printk("CS: %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds, es, cr0);
printk("CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3, cr4);
get_debugreg(d0, 0);
@@ -362,10 +362,10 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
if (test_thread_flag(TIF_IA32))
err = do_set_thread_area(p, -1,
(struct user_desc __user *)childregs->si, 0);
- else
-#endif
- err = do_arch_prctl(p, ARCH_SET_FS, childregs->r8);
- if (err)
+ else
+#endif
+ err = do_arch_prctl(p, ARCH_SET_FS, childregs->r8);
+ if (err)
goto out;
}
err = 0;
@@ -552,13 +552,13 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
*/
load_sp0(tss, next);
- /*
+ /*
* Switch DS and ES.
* This won't pick up thread selector changes, but I guess that is ok.
*/
savesegment(es, prev->es);
if (unlikely(next->es | prev->es))
- loadsegment(es, next->es);
+ loadsegment(es, next->es);
savesegment(ds, prev->ds);
if (unlikely(next->ds | prev->ds))
@@ -584,7 +584,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
*/
arch_leave_lazy_cpu_mode();
- /*
+ /*
* Switch FS and GS.
*
* Segment register != 0 always requires a reload. Also
@@ -593,13 +593,13 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
*/
if (unlikely(fsindex | next->fsindex | prev->fs)) {
loadsegment(fs, next->fsindex);
- /*
+ /*
* Check if the user used a selector != 0; if yes
* clear 64bit base, since overloaded base is always
* mapped to the Null selector
*/
if (fsindex)
- prev->fs = 0;
+ prev->fs = 0;
}
/* when next process has a 64bit base use it */
if (next->fs)
@@ -609,7 +609,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
if (unlikely(gsindex | next->gsindex | prev->gs)) {
load_gs_index(next->gsindex);
if (gsindex)
- prev->gs = 0;
+ prev->gs = 0;
}
if (next->gs)
wrmsrl(MSR_KERNEL_GS_BASE, next->gs);
@@ -618,12 +618,12 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
/* Must be after DS reload */
unlazy_fpu(prev_p);
- /*
+ /*
* Switch the PDA and FPU contexts.
*/
prev->usersp = read_pda(oldrsp);
write_pda(oldrsp, next->usersp);
- write_pda(pcurrent, next_p);
+ write_pda(pcurrent, next_p);
write_pda(kernelstack,
(unsigned long)task_stack_page(next_p) +
@@ -726,51 +726,51 @@ unsigned long get_wchan(struct task_struct *p)
int count = 0;
if (!p || p == current || p->state==TASK_RUNNING)
- return 0;
+ return 0;
stack = (unsigned long)task_stack_page(p);
if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE)
return 0;
fp = *(u64 *)(p->thread.sp);
- do {
+ do {
if (fp < (unsigned long)stack ||
fp > (unsigned long)stack+THREAD_SIZE)
- return 0;
+ return 0;
ip = *(u64 *)(fp+8);
if (!in_sched_functions(ip))
return ip;
- fp = *(u64 *)fp;
- } while (count++ < 16);
+ fp = *(u64 *)fp;
+ } while (count++ < 16);
return 0;
}
long do_arch_prctl(struct task_struct *task, int code, unsigned long addr)
-{
- int ret = 0;
+{
+ int ret = 0;
int doit = task == current;
int cpu;
- switch (code) {
+ switch (code) {
case ARCH_SET_GS:
if (addr >= TASK_SIZE_OF(task))
- return -EPERM;
+ return -EPERM;
cpu = get_cpu();
- /* handle small bases via the GDT because that's faster to
+ /* handle small bases via the GDT because that's faster to
switch. */
- if (addr <= 0xffffffff) {
- set_32bit_tls(task, GS_TLS, addr);
- if (doit) {
+ if (addr <= 0xffffffff) {
+ set_32bit_tls(task, GS_TLS, addr);
+ if (doit) {
load_TLS(&task->thread, cpu);
- load_gs_index(GS_TLS_SEL);
+ load_gs_index(GS_TLS_SEL);
}
- task->thread.gsindex = GS_TLS_SEL;
+ task->thread.gsindex = GS_TLS_SEL;
task->thread.gs = 0;
- } else {
+ } else {
task->thread.gsindex = 0;
task->thread.gs = addr;
if (doit) {
load_gs_index(0);
ret = checking_wrmsrl(MSR_KERNEL_GS_BASE, addr);
- }
+ }
}
put_cpu();
break;
--
1.5.4.5
Remove additional whitespaces and tabs.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/signal_64.c | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index b45ef8d..4b7e082 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -42,9 +42,9 @@
#endif
int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
- sigset_t *set, struct pt_regs * regs);
+ sigset_t *set, struct pt_regs * regs);
int ia32_setup_frame(int sig, struct k_sigaction *ka,
- sigset_t *set, struct pt_regs * regs);
+ sigset_t *set, struct pt_regs * regs);
asmlinkage long
sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss,
@@ -189,7 +189,7 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
current->blocked = set;
recalc_sigpending();
spin_unlock_irq(¤t->sighand->siglock);
-
+
if (restore_sigcontext(regs, &frame->uc.uc_mcontext, &ax))
goto badframe;
@@ -201,7 +201,7 @@ asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
badframe:
signal_fault(regs,frame,"sigreturn");
return 0;
-}
+}
/*
* Set up a signal frame.
@@ -267,32 +267,32 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
sigset_t *set, struct pt_regs * regs)
{
struct rt_sigframe __user *frame;
- struct _fpstate __user *fp = NULL;
+ struct _fpstate __user *fp = NULL;
int err = 0;
struct task_struct *me = current;
if (used_math()) {
- fp = get_stack(ka, regs, sizeof(struct _fpstate));
+ fp = get_stack(ka, regs, sizeof(struct _fpstate));
frame = (void __user *)round_down(
(unsigned long)fp - sizeof(struct rt_sigframe), 16) - 8;
if (!access_ok(VERIFY_WRITE, fp, sizeof(struct _fpstate)))
goto give_sigsegv;
- if (save_i387(fp) < 0)
- err |= -1;
+ if (save_i387(fp) < 0)
+ err |= -1;
} else
frame = get_stack(ka, regs, sizeof(struct rt_sigframe)) - 8;
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
goto give_sigsegv;
- if (ka->sa.sa_flags & SA_SIGINFO) {
+ if (ka->sa.sa_flags & SA_SIGINFO) {
err |= copy_siginfo_to_user(&frame->info, info);
if (err)
goto give_sigsegv;
}
-
+
/* Create the ucontext. */
err |= __put_user(0, &frame->uc.uc_flags);
err |= __put_user(0, &frame->uc.uc_link);
@@ -302,9 +302,9 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= __put_user(me->sas_ss_size, &frame->uc.uc_stack.ss_size);
err |= setup_sigcontext(&frame->uc.uc_mcontext, regs, set->sig[0], me);
err |= __put_user(fp, &frame->uc.uc_mcontext.fpstate);
- if (sizeof(*set) == 16) {
+ if (sizeof(*set) == 16) {
__put_user(set->sig[0], &frame->uc.uc_sigmask.sig[0]);
- __put_user(set->sig[1], &frame->uc.uc_sigmask.sig[1]);
+ __put_user(set->sig[1], &frame->uc.uc_sigmask.sig[1]);
} else
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
@@ -315,7 +315,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
err |= __put_user(ka->sa.sa_restorer, &frame->pretcode);
} else {
/* could use a vstub here */
- goto give_sigsegv;
+ goto give_sigsegv;
}
if (err)
@@ -323,7 +323,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
/* Set up registers for signal handler */
regs->di = sig;
- /* In case the signal handler was declared without prototypes */
+ /* In case the signal handler was declared without prototypes */
regs->ax = 0;
/* This also works for non SA_SIGINFO handlers because they expect the
@@ -376,7 +376,7 @@ static long current_syscall_ret(struct pt_regs *regs)
/*
* OK, we're invoking a handler
- */
+ */
static int
handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
@@ -420,7 +420,7 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka,
ret = ia32_setup_rt_frame(sig, ka, info, oldset, regs);
else
ret = ia32_setup_frame(sig, ka, oldset, regs);
- } else
+ } else
#endif
ret = setup_rt_frame(sig, ka, info, oldset, regs);
@@ -552,8 +552,8 @@ void do_notify_resume(struct pt_regs *regs, void *unused,
}
void signal_fault(struct pt_regs *regs, void __user *frame, char *where)
-{
- struct task_struct *me = current;
+{
+ struct task_struct *me = current;
if (show_unhandled_signals && printk_ratelimit()) {
printk("%s[%d] bad frame in %s frame:%p ip:%lx sp:%lx orax:%lx",
me->comm,me->pid,where,frame,regs->ip,regs->sp,regs->orig_ax);
@@ -561,5 +561,5 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where)
printk("\n");
}
- force_sig(SIGSEGV, me);
-}
+ force_sig(SIGSEGV, me);
+}
--
1.5.4.5
Remove additional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/traps_64.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/traps_64.c b/arch/x86/kernel/traps_64.c
index 3f18d73..9118b7d 100644
--- a/arch/x86/kernel/traps_64.c
+++ b/arch/x86/kernel/traps_64.c
@@ -493,7 +493,7 @@ unsigned __kprobes long oops_begin(void)
raw_local_irq_save(flags);
cpu = smp_processor_id();
if (!__raw_spin_trylock(&die_lock)) {
- if (cpu == die_owner)
+ if (cpu == die_owner)
/* nested oops. should stop eventually */;
else
__raw_spin_lock(&die_lock);
@@ -882,7 +882,7 @@ asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)
else if (user_mode(eregs))
regs = task_pt_regs(current);
/* Exception from kernel and interrupts are enabled. Move to
- kernel process stack. */
+ kernel process stack. */
else if (eregs->flags & X86_EFLAGS_IF)
regs = (struct pt_regs *)(eregs->sp -= sizeof(struct pt_regs));
if (eregs != regs)
@@ -1035,7 +1035,7 @@ asmlinkage void do_coprocessor_error(struct pt_regs *regs)
asmlinkage void bad_intr(void)
{
- printk("bad interrupt");
+ printk("bad interrupt");
}
asmlinkage void do_simd_coprocessor_error(struct pt_regs *regs)
@@ -1142,7 +1142,7 @@ void __init trap_init(void)
set_intr_gate(0, ÷_error);
set_intr_gate_ist(1, &debug, DEBUG_STACK);
set_intr_gate_ist(2, &nmi, NMI_STACK);
- set_system_gate_ist(3, &int3, DEBUG_STACK); /* int3 can be called from all */
+ set_system_gate_ist(3, &int3, DEBUG_STACK); /* int3 can be called from all */
set_system_gate(4, &overflow); /* int4 can be called from all */
set_intr_gate(5, &bounds);
set_intr_gate(6, &invalid_op);
--
1.5.4.5
Remove additional tab.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/tsc.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 7603c05..34e55d9 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -307,7 +307,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
if ((val == CPUFREQ_PRECHANGE && freq->old < freq->new) ||
(val == CPUFREQ_POSTCHANGE && freq->old > freq->new) ||
(val == CPUFREQ_RESUMECHANGE)) {
- *lpj = cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new);
+ *lpj = cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new);
tsc_khz = cpufreq_scale(tsc_khz_ref, ref_freq, freq->new);
if (!(freq->flags & CPUFREQ_CONST_LOOPS))
--
1.5.4.5
Remove additional whitespace.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/visws_quirks.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/kernel/visws_quirks.c
index 41e01b1..03a45be 100644
--- a/arch/x86/kernel/visws_quirks.c
+++ b/arch/x86/kernel/visws_quirks.c
@@ -668,7 +668,7 @@ static struct irqaction master_action = {
};
static struct irqaction cascade_action = {
- .handler = no_action,
+ .handler = no_action,
.name = "cascade",
};
--
1.5.4.5
Remove additional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/vmi_32.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c
index 0a1b1a9..2c04b0b 100644
--- a/arch/x86/kernel/vmi_32.c
+++ b/arch/x86/kernel/vmi_32.c
@@ -74,7 +74,7 @@ static struct {
void (*_flush_tlb)(int);
void (*set_initial_ap_state)(int, int);
void (*halt)(void);
- void (*set_lazy_mode)(int mode);
+ void (*set_lazy_mode)(int mode);
} vmi_ops;
/* Cached VMI operations */
@@ -400,18 +400,18 @@ static void vmi_allocate_pte(struct mm_struct *mm, u32 pfn)
static void vmi_allocate_pmd(struct mm_struct *mm, u32 pfn)
{
- /*
+ /*
* This call comes in very early, before mem_map is setup.
* It is called only for swapper_pg_dir, which already has
* data on it.
*/
- vmi_set_page_type(pfn, VMI_PAGE_L2);
+ vmi_set_page_type(pfn, VMI_PAGE_L2);
vmi_ops.allocate_page(pfn, VMI_PAGE_L2, 0, 0, 0);
}
static void vmi_allocate_pmd_clone(u32 pfn, u32 clonepfn, u32 start, u32 count)
{
- vmi_set_page_type(pfn, VMI_PAGE_L2 | VMI_PAGE_CLONE);
+ vmi_set_page_type(pfn, VMI_PAGE_L2 | VMI_PAGE_CLONE);
vmi_check_page_type(clonepfn, VMI_PAGE_L2);
vmi_ops.allocate_page(pfn, VMI_PAGE_L2 | VMI_PAGE_CLONE, clonepfn, start, count);
}
@@ -681,7 +681,7 @@ static inline int __init probe_vmi_rom(void)
*/
void vmi_bringup(void)
{
- /* We must establish the lowmem mapping for MMU ops to work */
+ /* We must establish the lowmem mapping for MMU ops to work */
if (vmi_ops.set_linear_mapping)
vmi_ops.set_linear_mapping(0, (void *)__PAGE_OFFSET, max_low_pfn, 0);
}
@@ -710,9 +710,9 @@ static void *vmi_get_function(int vmicall)
do { \
reloc = call_vrom_long_func(vmi_rom, get_reloc, \
VMI_CALL_##vmicall); \
- if (rel->type == VMI_RELOCATION_CALL_REL) \
+ if (rel->type == VMI_RELOCATION_CALL_REL) \
opname = (void *)rel->eip; \
- else if (rel->type == VMI_RELOCATION_NOP) \
+ else if (rel->type == VMI_RELOCATION_NOP) \
opname = (void *)vmi_nop; \
else if (rel->type != VMI_RELOCATION_NONE) \
printk(KERN_WARNING "VMI: Unknown relocation " \
--
1.5.4.5
Remove addtional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/vmiclock_32.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/x86/kernel/vmiclock_32.c b/arch/x86/kernel/vmiclock_32.c
index 6953859..00d0c8b 100644
--- a/arch/x86/kernel/vmiclock_32.c
+++ b/arch/x86/kernel/vmiclock_32.c
@@ -115,11 +115,11 @@ static void ack_timer_irq(unsigned int irq)
}
static struct irq_chip vmi_chip __read_mostly = {
- .name = "VMI-LOCAL",
- .startup = startup_timer_irq,
- .mask = mask_timer_irq,
- .unmask = unmask_timer_irq,
- .ack = ack_timer_irq
+ .name = "VMI-LOCAL",
+ .startup = startup_timer_irq,
+ .mask = mask_timer_irq,
+ .unmask = unmask_timer_irq,
+ .ack = ack_timer_irq
};
#endif
@@ -200,10 +200,10 @@ static irqreturn_t vmi_timer_interrupt(int irq, void *dev_id)
}
static struct irqaction vmi_clock_action = {
- .name = "vmi-timer",
- .handler = vmi_timer_interrupt,
- .flags = IRQF_DISABLED | IRQF_NOBALANCING,
- .mask = CPU_MASK_ALL,
+ .name = "vmi-timer",
+ .handler = vmi_timer_interrupt,
+ .flags = IRQF_DISABLED | IRQF_NOBALANCING,
+ .mask = CPU_MASK_ALL,
};
static void __devinit vmi_time_init_clockevent(void)
--
1.5.4.5
Remove additional whitespaces.
Signed-off-by: Gustavo F. Padovan <[email protected]>
---
arch/x86/kernel/sys_x86_64.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
index 3b360ef..ef4eb7c 100644
--- a/arch/x86/kernel/sys_x86_64.c
+++ b/arch/x86/kernel/sys_x86_64.c
@@ -56,9 +56,9 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
unmapped base down for this case. This can give
conflicts with the heap, but we assume that glibc
malloc knows how to fall back to mmap. Give it 1GB
- of playground for now. -AK */
- *begin = 0x40000000;
- *end = 0x80000000;
+ of playground for now. -AK */
+ *begin = 0x40000000;
+ *end = 0x80000000;
if (current->flags & PF_RANDOMIZE) {
new_begin = randomize_range(*begin, *begin + 0x02000000, 0);
if (new_begin)
@@ -66,9 +66,9 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
}
} else {
*begin = TASK_UNMAPPED_BASE;
- *end = TASK_SIZE;
+ *end = TASK_SIZE;
}
-}
+}
unsigned long
arch_get_unmapped_area(struct file *filp, unsigned long addr,
@@ -78,11 +78,11 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
struct vm_area_struct *vma;
unsigned long start_addr;
unsigned long begin, end;
-
+
if (flags & MAP_FIXED)
return addr;
- find_start_end(flags, &begin, &end);
+ find_start_end(flags, &begin, &end);
if (len > end)
return -ENOMEM;
@@ -100,8 +100,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
mm->free_area_cache = begin;
}
addr = mm->free_area_cache;
- if (addr < begin)
- addr = begin;
+ if (addr < begin)
+ addr = begin;
start_addr = addr;
full_search:
@@ -230,7 +230,7 @@ asmlinkage long sys_uname(struct new_utsname __user * name)
down_read(&uts_sem);
err = copy_to_user(name, utsname(), sizeof (*name));
up_read(&uts_sem);
- if (personality(current->personality) == PER_LINUX32)
- err |= copy_to_user(&name->machine, "i686", 5);
+ if (personality(current->personality) == PER_LINUX32)
+ err |= copy_to_user(&name->machine, "i686", 5);
return err ? -EFAULT : 0;
}
--
1.5.4.5
Gustavo F. Padovan wrote:
> Ingo,
>
>
> Ingo,
>
> I removed many extra whitespaces and tabs from arch/x86/kernel/
>
This is not a good time to be posting this kind of patch. These kinds
of trivial cleanups are best done in a late -rc, when the patch rate
goes down. However, pure whitespace cleanups have very little value
like this, particularly since it looks like you're breaking the
formatting in some cases.
It would be better to address them in passing if there's some more
substantial change which needs to be done to the code.
http://janitor.kernelnewbies.org/ should be a good place to look for
suggestions.
J
* Gustavo F. Padovan <[email protected]> wrote:
> Ingo,
>
> I removed many extra whitespaces and tabs from arch/x86/kernel/
hm, we tend to do a full cleanup of files we touch for style
cleanup.
You can check some style errors via:
scripts/checkpatch.pl --file arch/x86/kernel/alternative.c
but it also makes sense to look at the file and figure out places that
look ugly.
> x86: kernel/alternative.c cleanup
total: 4 errors, 15 warnings, 4 checks, 540 lines checked
> x86: kernel/apm_32.c cleanup
total: 6 errors, 27 warnings, 5 checks, 2416 lines checked
[ etc. ]
If we did each style problem separately we'd be generating over 1
million commits for the entire tree - that's not feasible. So we go per
file and once a file has been cleaned up, we keep it clean.
Note, checkpatch errors can be false positives occasionally, and not all
warnings have to be fixed all the time - ask if unsure about whether to
fix something or not.
It's also useful to check that the .o's are unchanged after a cleanup.
You can see commits that do that, for example:
commit d4413732b54a17684e48fbb4b52fade5bf965b5d
Author: Paolo Ciarrocchi <[email protected]>
Date: Tue Feb 19 23:51:27 2008 +0100
x86: coding style fixes to arch/x86/oprofile/op_model_athlon.c
The patch fixes 33 errors and a few warnings reported by checkpatch.pl
arch/x86/oprofile/op_model_athlon.o:
text data bss dec hex filename
1691 0 32 1723 6bb op_model_athlon.o.before
1691 0 32 1723 6bb op_model_athlon.o.after
md5:
c354bc2d7140e1e626c03390eddaa0a6 op_model_athlon.o.before.asm
c354bc2d7140e1e626c03390eddaa0a6 op_model_athlon.o.after.asm
Signed-off-by: Paolo Ciarrocchi <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
Ingo
On Mon, Jul 28, 2008 at 6:20 PM, Ingo Molnar <[email protected]> wrote:
>
> * Gustavo F. Padovan <[email protected]> wrote:
>
>> Ingo,
>>
>> I removed many extra whitespaces and tabs from arch/x86/kernel/
>
> hm, we tend to do a full cleanup of files we touch for style
> cleanup.
>
> You can check some style errors via:
>
> scripts/checkpatch.pl --file arch/x86/kernel/alternative.c
>
> but it also makes sense to look at the file and figure out places that
> look ugly.
>
>> x86: kernel/alternative.c cleanup
>
> total: 4 errors, 15 warnings, 4 checks, 540 lines checked
>
>> x86: kernel/apm_32.c cleanup
>
> total: 6 errors, 27 warnings, 5 checks, 2416 lines checked
>
> [ etc. ]
>
> If we did each style problem separately we'd be generating over 1
> million commits for the entire tree - that's not feasible. So we go per
> file and once a file has been cleaned up, we keep it clean.
>
> Note, checkpatch errors can be false positives occasionally, and not all
> warnings have to be fixed all the time - ask if unsure about whether to
> fix something or not.
>
> It's also useful to check that the .o's are unchanged after a cleanup.
> You can see commits that do that, for example:
Right. I will do this.
Thanks, Ingo.
>
> commit d4413732b54a17684e48fbb4b52fade5bf965b5d
> Author: Paolo Ciarrocchi <[email protected]>
> Date: Tue Feb 19 23:51:27 2008 +0100
>
> x86: coding style fixes to arch/x86/oprofile/op_model_athlon.c
>
> The patch fixes 33 errors and a few warnings reported by checkpatch.pl
>
> arch/x86/oprofile/op_model_athlon.o:
> text data bss dec hex filename
> 1691 0 32 1723 6bb op_model_athlon.o.before
> 1691 0 32 1723 6bb op_model_athlon.o.after
> md5:
> c354bc2d7140e1e626c03390eddaa0a6 op_model_athlon.o.before.asm
> c354bc2d7140e1e626c03390eddaa0a6 op_model_athlon.o.after.asm
>
> Signed-off-by: Paolo Ciarrocchi <[email protected]>
> Signed-off-by: Ingo Molnar <[email protected]>
>
> Ingo
>
--
----------------------------------------------
Gustavo Fernando Padovan
Engenharia de Computa??o 2006
LAS - Laborat?rio de Administra??o e Seguran?a de Sistemas
Instituto de Computa??o - UNICAMP
[email protected]
[email protected]
[email protected]
-------------------------------------------
Seja Livre, use Software Livre
Gustavo F. Padovan wrote:
> Remove additional whitespaces.
>
> Signed-off-by: Gustavo F. Padovan <[email protected]>
Thank you for cleanup!
Acked-by: Masami Hiramatsu <[email protected]>
> ---
> arch/x86/kernel/kprobes.c | 10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
> index 6c27679..d3190dc 100644
> --- a/arch/x86/kernel/kprobes.c
> +++ b/arch/x86/kernel/kprobes.c
> @@ -30,14 +30,14 @@
> * <[email protected]> and Prasanna S Panchamukhi
> * <[email protected]> added function-return probes.
> * 2005-May Rusty Lynch <[email protected]>
> - * Added function return probes functionality
> + * Added function return probes functionality
> * 2006-Feb Masami Hiramatsu <[email protected]> added
> - * kprobe-booster and kretprobe-booster for i386.
> + * kprobe-booster and kretprobe-booster for i386.
> * 2007-Dec Masami Hiramatsu <[email protected]> added kprobe-booster
> - * and kretprobe-booster for x86-64
> + * and kretprobe-booster for x86-64
> * 2007-Dec Masami Hiramatsu <[email protected]>, Arjan van de Ven
> - * <[email protected]> and Jim Keniston <[email protected]>
> - * unified x86 kprobes code.
> + * <[email protected]> and Jim Keniston <[email protected]>
> + * unified x86 kprobes code.
> */
>
> #include <linux/kprobes.h>
--
Masami Hiramatsu
Software Engineer
Hitachi Computer Products (America) Inc.
Software Solutions Division
e-mail: [email protected]
On 28.07.08 18:09:09, Gustavo F. Padovan wrote:
> Remove additional whitespaces and tabs.
>
> Signed-off-by: Gustavo F. Padovan <[email protected]>
> ---
> arch/x86/kernel/apm_32.c | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
> index 9ee24e6..b0c049c 100644
> --- a/arch/x86/kernel/apm_32.c
> +++ b/arch/x86/kernel/apm_32.c
> @@ -435,7 +435,7 @@ static const char * const apm_event_name[] = {
>
> typedef struct lookup_t {
> int key;
> - char *msg;
> + char *msg;
Shouldn't this be a tab?
> } lookup_t;
>
> /*
> @@ -1679,8 +1679,8 @@ static int apm(void *unused)
> unsigned short cx;
> unsigned short dx;
> int error;
> - char *power_stat;
> - char *bat_stat;
> + char *power_stat;
> + char *bat_stat;
Why not using same indention as for error?
-Robert
>
> #ifdef CONFIG_SMP
> /* 2002/08/01 - WT
> --
> 1.5.4.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
Advanced Micro Devices, Inc.
Operating System Research Center
email: [email protected]