# HG changeset patch # User chrisw@osdl.org[kaf24] # Date 1113992618 0 # Node ID c75e32dc585e8d689767985820d7b69ccf59794f # Parent 7ea211de82a9dabb9dec5814eed657c570379bd6 bitkeeper revision 1.1331 (42662daawcgGfsYXrl37riGl22RhdA) [PATCH] [PATCH 1/2] i386 whitespace cleanup in Linux sparse tree Eliminate extraneous whitespace changes in i386 portion of Linux sparse patch. Signed-off-by: Chris Wright diff -r 7ea211de82a9 -r c75e32dc585e linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig --- a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig Wed Apr 20 10:00:10 2005 +0000 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig Wed Apr 20 10:23:38 2005 +0000 @@ -457,22 +457,22 @@ config PREEMPT_BKL # enters thermal throttling. config MICROCODE - tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support" + tristate "/dev/cpu/microcode - Intel IA32 CPU microcode support" depends on XEN_PRIVILEGED_GUEST - ---help--- - If you say Y here and also to "/dev file system support" in the - 'File systems' section, you will be able to update the microcode on - Intel processors in the IA32 family, e.g. Pentium Pro, Pentium II, - Pentium III, Pentium 4, Xeon etc. You will obviously need the - actual microcode binary data itself which is not shipped with the - Linux kernel. + ---help--- + If you say Y here and also to "/dev file system support" in the + 'File systems' section, you will be able to update the microcode on + Intel processors in the IA32 family, e.g. Pentium Pro, Pentium II, + Pentium III, Pentium 4, Xeon etc. You will obviously need the + actual microcode binary data itself which is not shipped with the + Linux kernel. - For latest news and information on obtaining all the required - ingredients for this driver, check: - . + For latest news and information on obtaining all the required + ingredients for this driver, check: + . - To compile this driver as a module, choose M here: the - module will be called microcode. + To compile this driver as a module, choose M here: the + module will be called microcode. #config X86_MSR # tristate "/dev/cpu/*/msr - Model-specific register support" diff -r 7ea211de82a9 -r c75e32dc585e linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c Wed Apr 20 10:00:10 2005 +0000 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c Wed Apr 20 10:23:38 2005 +0000 @@ -600,7 +600,7 @@ void __init cpu_init (void) * Set up the per-thread TLS descriptor cache: */ memcpy(thread->tls_array, &get_cpu_gdt_table(cpu)[GDT_ENTRY_TLS_MIN], - GDT_ENTRY_TLS_ENTRIES * 8); + GDT_ENTRY_TLS_ENTRIES * 8); cpu_gdt_init(&cpu_gdt_descr[cpu]); diff -r 7ea211de82a9 -r c75e32dc585e linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S Wed Apr 20 10:00:10 2005 +0000 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S Wed Apr 20 10:23:38 2005 +0000 @@ -67,10 +67,10 @@ checkCPUtype: incb ready - xorl %eax,%eax # Clear FS/GS and LDT + xorl %eax,%eax # Clear FS/GS and LDT movl %eax,%fs movl %eax,%gs - cld # gcc2 wants the direction flag cleared at all times + cld # gcc2 wants the direction flag cleared at all times #ifdef CONFIG_SMP movb ready, %cl diff -r 7ea211de82a9 -r c75e32dc585e linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c --- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c Wed Apr 20 10:00:10 2005 +0000 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c Wed Apr 20 10:23:38 2005 +0000 @@ -266,7 +266,7 @@ static unsigned long cpu_khz_ref = 0; static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, - void *data) + void *data) { struct cpufreq_freqs *freq = data; @@ -338,7 +338,7 @@ static int init_tsc(char* override) /* (10^6 * 2^32) / cpu_hz = (10^3 * 2^32) / cpu_khz = (2^32 * 1 / (clocks/us)) */ - { + { unsigned long eax=0, edx=1000; __asm__("divl %2" :"=a" (fast_gettimeoffset_quotient), "=d" (edx) diff -r 7ea211de82a9 -r c75e32dc585e linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c --- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c Wed Apr 20 10:00:10 2005 +0000 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c Wed Apr 20 10:23:38 2005 +0000 @@ -229,10 +229,10 @@ fastcall void do_page_fault(struct pt_re error_code |= (regs->xcs & 2) << 1; if (regs->eflags & X86_EFLAGS_VM) error_code |= 4; - - if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14, - SIGSEGV) == NOTIFY_STOP) - return; + + if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14, + SIGSEGV) == NOTIFY_STOP) + return; #if 0 /* It's safe to allow irq's after cr2 has been saved */ if (regs->eflags & (X86_EFLAGS_IF|VM_MASK)) diff -r 7ea211de82a9 -r c75e32dc585e linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c --- a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c Wed Apr 20 10:00:10 2005 +0000 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c Wed Apr 20 10:23:38 2005 +0000 @@ -71,13 +71,11 @@ struct pci_raw_ops pci_direct_xen = { .write = pci_conf_write, }; - static int __init pci_direct_init(void) { - - printk(KERN_INFO "PCI: Using configuration type Xen\n"); - raw_pci_ops = &pci_direct_xen; - return 0; + printk(KERN_INFO "PCI: Using configuration type Xen\n"); + raw_pci_ops = &pci_direct_xen; + return 0; } arch_initcall(pci_direct_init); diff -r 7ea211de82a9 -r c75e32dc585e linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c --- a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c Wed Apr 20 10:00:10 2005 +0000 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c Wed Apr 20 10:23:38 2005 +0000 @@ -93,7 +93,7 @@ void pcibios_penalize_isa_irq(int irq) static int pirq_enable_irq(struct pci_dev *dev) { int err; - u8 pin; + u8 pin; physdev_op_t op; /* Inform Xen that we are going to use this device. */