ChangeSet 1.1331, 2005/04/20 11:23:38+01:00, chrisw@xxxxxxxx
[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 <chrisw@xxxxxxxx>
Kconfig | 26 +++++++++++++-------------
kernel/cpu/common.c | 2 +-
kernel/head.S | 4 ++--
kernel/timers/timer_tsc.c | 4 ++--
mm/fault.c | 8 ++++----
pci/direct.c | 8 +++-----
pci/irq.c | 2 +-
7 files changed, 26 insertions(+), 28 deletions(-)
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig 2005-04-20 07:02:47
-04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig 2005-04-20 07:02:47
-04:00
@@ -457,22 +457,22 @@
# 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:
- <http://www.urbanmyth.org/microcode/>.
+ For latest news and information on obtaining all the required
+ ingredients for this driver, check:
+ <http://www.urbanmyth.org/microcode/>.
- 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 -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c
b/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 2005-04-20
07:02:47 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c 2005-04-20
07:02:47 -04:00
@@ -600,7 +600,7 @@
* 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 -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S
b/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 2005-04-20
07:02:47 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S 2005-04-20
07:02:47 -04:00
@@ -67,10 +67,10 @@
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 -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c
b/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
2005-04-20 07:02:47 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c
2005-04-20 07:02:47 -04:00
@@ -266,7 +266,7 @@
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 @@
/* (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 -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c
b/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 2005-04-20 07:02:46
-04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c 2005-04-20 07:02:46
-04:00
@@ -229,10 +229,10 @@
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 -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c
b/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 2005-04-20
07:02:47 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c 2005-04-20
07:02:47 -04:00
@@ -71,13 +71,11 @@
.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 -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c
b/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 2005-04-20 07:02:47
-04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c 2005-04-20 07:02:47
-04:00
@@ -93,7 +93,7 @@
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. */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home