* [PATCH 0/2] whitespace cleanup in Linux sparse tree
@ 2005-04-19 21:51 Chris Wright
2005-04-19 21:52 ` [PATCH 1/2] i386 " Chris Wright
2005-04-19 21:53 ` [PATCH 2/2] x86_64 " Chris Wright
0 siblings, 2 replies; 3+ messages in thread
From: Chris Wright @ 2005-04-19 21:51 UTC (permalink / raw)
To: xen-devel
The following two patches are another pass through low hanging fruit for
reducing the size of the Linux sparse patch. Here I simply remove all
extraneous whitespace changes (broken up into i386 and x86_64 patches).
The actual patch file drops about 7k in size, below are the diffstat
differences.
Current:
$ ./mkpatch | diffstat | tail -1
76 files changed, 6599 insertions(+), 5630 deletions(-)
With i386 whitespace changes removed (patch 1/2)
$ ./mkpatch | diffstat | tail -1
76 files changed, 6572 insertions(+), 5605 deletions(-)
With both i386 and x86_64 whitespace changes removed (patch 2/2):
$ ./mkpatch | diffstat | tail -1
76 files changed, 6476 insertions(+), 5511 deletions(-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] i386 whitespace cleanup in Linux sparse tree
2005-04-19 21:51 [PATCH 0/2] whitespace cleanup in Linux sparse tree Chris Wright
@ 2005-04-19 21:52 ` Chris Wright
2005-04-19 21:53 ` [PATCH 2/2] x86_64 " Chris Wright
1 sibling, 0 replies; 3+ messages in thread
From: Chris Wright @ 2005-04-19 21:52 UTC (permalink / raw)
To: xen-devel
Eliminate extraneous whitespace changes in i386 portion of Linux
sparse patch.
Signed-off-by: Chris Wright <chrisw@osdl.org>
---
linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig | 26 +++++-----
linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c | 2
linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S | 4 -
linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c | 4 -
linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c | 8 +--
linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c | 8 +--
linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c | 2
7 files changed, 26 insertions(+), 28 deletions(-)
===== linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig 1.18 vs edited =====
--- 1.18/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig 2005-04-06 01:37:08 -07:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/i386/Kconfig 2005-04-15 14:40:32 -07:00
@@ -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:
- <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"
===== linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S 1.17 vs edited =====
--- 1.17/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S 2005-03-30 02:57:33 -08:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/head.S 2005-04-15 14:40:32 -07:00
@@ -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
===== linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c 1.18 vs edited =====
--- 1.18/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c 2005-04-04 08:38:39 -07:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/cpu/common.c 2005-04-15 14:46:01 -07:00
@@ -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]);
===== linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c 1.19 vs edited =====
--- 1.19/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c 2005-03-09 13:38:06 -08:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c 2005-04-15 14:40:33 -07:00
@@ -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)
===== linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c 1.18 vs edited =====
--- 1.18/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c 2005-04-04 08:38:39 -07:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/i386/mm/fault.c 2005-04-15 14:40:34 -07:00
@@ -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))
===== linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c 1.9 vs edited =====
--- 1.9/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c 2005-03-09 13:38:06 -08:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/i386/pci/direct.c 2005-04-15 14:40:34 -07:00
@@ -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);
===== linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c 1.12 vs edited =====
--- 1.12/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c 2005-03-10 16:16:04 -08:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/i386/pci/irq.c 2005-04-15 14:40:34 -07:00
@@ -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. */
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/2] x86_64 whitespace cleanup in Linux sparse tree
2005-04-19 21:51 [PATCH 0/2] whitespace cleanup in Linux sparse tree Chris Wright
2005-04-19 21:52 ` [PATCH 1/2] i386 " Chris Wright
@ 2005-04-19 21:53 ` Chris Wright
1 sibling, 0 replies; 3+ messages in thread
From: Chris Wright @ 2005-04-19 21:53 UTC (permalink / raw)
To: xen-devel
Eliminate extraneous whitespace changes in x86_64 portion of Linux
sparse patch.
Signed-off-by: Chris Wright <chrisw@osdl.org>
---
linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S | 32 ++++----
linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S | 10 +-
linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/ldt.c | 5 -
linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/pci-dma.c | 36 ++++-----
linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/process.c | 8 +-
linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c | 15 +--
linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup64.c | 24 +++---
linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/traps.c | 2
linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c | 60 +++++++--------
linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/ioremap.c | 2
10 files changed, 96 insertions(+), 98 deletions(-)
===== linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S 1.3 vs edited =====
--- 1.3/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S 2005-04-06 01:37:08 -07:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S 2005-04-15 14:40:34 -07:00
@@ -108,7 +108,7 @@ ECF_IN_SYSCALL = (1<<8)
#define preempt_stop
#define retint_kernel retint_restore_args
#endif
-
+
/*
* C code is not supposed to know about undefined top of stack. Every time
@@ -191,7 +191,7 @@ ECF_IN_SYSCALL = (1<<8)
1:
.endm
-/*
+/*
* A newly forked process directly context switches into this.
*/
/* rdi: prev */
@@ -276,7 +276,7 @@ sysret_check:
XEN_UNBLOCK_EVENTS(%r11)
RESTORE_ARGS 0,8,0
SWITCH_TO_USER ECF_IN_SYSCALL
-
+
/* Handle reschedules */
/* edx: work, edi: workmask */
sysret_careful:
@@ -491,11 +491,11 @@ ENTRY(stub_rt_sigreturn)
#else
SAVE_ARGS
leaq -ARGOFFSET(%rsp),%rdi # arg1 for handler
-#endif
+#endif
#if 0 /* For Xen we don't need to do this */
testl $3,CS(%rdi)
je 1f
- swapgs
+ swapgs
#endif
1: addl $1,%gs:pda_irqcount # RED-PEN should check preempt count
movq %gs:pda_irqstackptr,%rax
@@ -508,16 +508,16 @@ retint_check:
movl threadinfo_flags(%rcx),%edx
andl %edi,%edx
jnz retint_careful
-retint_restore_args:
- RESTORE_ARGS 0,8,0
+retint_restore_args:
+ RESTORE_ARGS 0,8,0
testb $3,8(%rsp) # check CS
jnz user_mode
kernel_mode:
orb $3,1*8(%rsp)
- iretq
+ iretq
user_mode:
SWITCH_TO_USER 0
-
+
/* edi: workmask, edx: work */
retint_careful:
bt $TIF_NEED_RESCHED,%edx
@@ -527,7 +527,7 @@ retint_careful:
/* sti */
pushq %rdi
call schedule
- popq %rdi
+ popq %rdi
XEN_GET_VCPU_INFO(%r11)
XEN_BLOCK_EVENTS(%r11)
GET_THREAD_INFO(%rcx)
@@ -661,7 +661,7 @@ ENTRY(error_entry)
CFI_REL_OFFSET rsp,(RSP-RDI)
CFI_REL_OFFSET rip,(RIP-RDI)
/* rdi slot contains rax, oldrax contains error code */
- cld
+ cld
subq $14*8,%rsp
CFI_ADJUST_CFA_OFFSET (14*8)
movq %rsi,13*8(%rsp)
@@ -717,7 +717,7 @@ error_check_event:
andb $1,%al # %al == mask & ~saved_mask
jnz restore_all_enable_events # != 0 => reenable event delivery
XEN_UNLOCK_VCPU_INFO_SMP(%rsi)
-error_exit:
+error_exit:
RESTORE_REST
/* cli */
GET_THREAD_INFO(%rcx)
@@ -727,7 +727,7 @@ error_exit:
movl $_TIF_WORK_MASK,%edi
andl %edi,%edx
jnz retint_careful
- RESTORE_ARGS 0,8,0
+ RESTORE_ARGS 0,8,0
SWITCH_TO_USER 0
CFI_ENDPROC
@@ -756,7 +756,7 @@ error_kernelspace:
je error_swapgs
jmp error_sti
#endif
-
+
ENTRY(hypervisor_callback)
zeroentry do_hypervisor_callback
@@ -896,7 +896,7 @@ ENTRY(failsafe_callback)
.long 3b,8b; \
.long 4b,9b; \
.previous
-
+
.section __ex_table,"a"
.align 8
.quad gs_change,bad_gs
@@ -1051,7 +1051,7 @@ ENTRY(debug)
CFI_ENDPROC
#if 0
- /* runs on exception stack */
+ /* runs on exception stack */
ENTRY(nmi)
CFI_STARTPROC
pushq $-1
===== linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S 1.2 vs edited =====
--- 1.2/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S 2005-04-02 12:27:09 -08:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S 2005-04-15 14:40:35 -07:00
@@ -41,7 +41,7 @@
.code64
ENTRY(_start)
cld
- movq init_rsp(%rip),%rsp
+ movq init_rsp(%rip),%rsp
/* Copy the necessary stuff from xen_start_info structure. */
movq $xen_start_info_union,%rdi
movq $64,%rcx /* sizeof (union xen_start_info_union) / sizeof (long) */
@@ -89,7 +89,7 @@ ENTRY(lgdt_finish)
pushq %rax
lretq
#endif
-
+
ENTRY(stext)
ENTRY(_stext)
@@ -113,7 +113,7 @@ ENTRY(init_level4_pgt)
.org 0x2000
ENTRY(init_level4_user_pgt)
.fill 512,8,0
-
+
/*
* This is used for vsyscall area mapping as we have a different
* level4 page table for user.
@@ -130,7 +130,7 @@ ENTRY(cpu_gdt_table)
.quad 0x008ffa000000ffff /* __KERNEL_COMPAT32_CS */
.quad 0x00affa000000ffff /* __KERNEL_CS */
.quad 0x00cff2000000ffff /* __KERNEL_DS */
-
+
.quad 0x00cffa000000ffff /* __USER32_CS */
.quad 0x00cff2000000ffff /* __USER_DS, __USER32_DS */
.quad 0x00affa000000ffff /* __USER_CS */
@@ -194,7 +194,7 @@ gdt32_end:
* IRET will check the segment types kkeil 2000/10/28
* Also sysret mandates a special GDT layout
*/
-
+
#if 0
.align L1_CACHE_BYTES
#endif
===== linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/ldt.c 1.3 vs edited =====
--- 1.3/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/ldt.c 2005-04-06 01:37:08 -07:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/ldt.c 2005-04-15 14:40:35 -07:00
@@ -27,9 +27,8 @@
#ifdef CONFIG_SMP /* avoids "defined but not used" warnig */
static void flush_ldt(void *null)
{
- if (current->active_mm) {
- load_LDT(¤t->active_mm->context);
- }
+ if (current->active_mm)
+ load_LDT(¤t->active_mm->context);
}
#endif
===== linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/pci-dma.c 1.3 vs edited =====
--- 1.3/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/pci-dma.c 2005-04-06 01:37:08 -07:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/pci-dma.c 2005-04-15 14:46:40 -07:00
@@ -26,18 +26,18 @@
* the same here.
*/
int dma_map_sg(struct device *hwdev, struct scatterlist *sg,
- int nents, int direction)
+ int nents, int direction)
{
- int i;
+ int i;
- BUG_ON(direction == DMA_NONE);
- for (i = 0; i < nents; i++ ) {
- struct scatterlist *s = &sg[i];
- BUG_ON(!s->page);
- s->dma_address = virt_to_bus(page_address(s->page) +s->offset);
- s->dma_length = s->length;
- }
- return nents;
+ BUG_ON(direction == DMA_NONE);
+ for (i = 0; i < nents; i++ ) {
+ struct scatterlist *s = &sg[i];
+ BUG_ON(!s->page);
+ s->dma_address = virt_to_bus(page_address(s->page) +s->offset);
+ s->dma_length = s->length;
+ }
+ return nents;
}
EXPORT_SYMBOL(dma_map_sg);
@@ -47,15 +47,15 @@ EXPORT_SYMBOL(dma_map_sg);
* pci_unmap_single() above.
*/
void dma_unmap_sg(struct device *dev, struct scatterlist *sg,
- int nents, int dir)
+ int nents, int dir)
{
- int i;
- for (i = 0; i < nents; i++) {
- struct scatterlist *s = &sg[i];
- BUG_ON(s->page == NULL);
- BUG_ON(s->dma_address == 0);
- dma_unmap_single(dev, s->dma_address, s->dma_length, dir);
- }
+ int i;
+ for (i = 0; i < nents; i++) {
+ struct scatterlist *s = &sg[i];
+ BUG_ON(s->page == NULL);
+ BUG_ON(s->dma_address == 0);
+ dma_unmap_single(dev, s->dma_address, s->dma_length, dir);
+ }
}
struct dma_coherent_mem {
===== linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/process.c 1.3 vs edited =====
--- 1.3/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/process.c 2005-04-06 01:37:08 -07:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/process.c 2005-04-15 14:40:35 -07:00
@@ -121,7 +121,7 @@ void cpu_idle (void)
if (cpu_isset(cpu, cpu_idle_map))
cpu_clear(cpu, cpu_idle_map);
rmb();
-
+
__IRQ_STAT(cpu,idle_timestamp) = jiffies;
xen_idle();
}
@@ -369,7 +369,7 @@ struct task_struct *__switch_to(struct t
struct tss_struct *tss = &per_cpu(init_tss, cpu);
physdev_op_t iopl_op, iobmp_op;
multicall_entry_t _mcl[8], *mcl = _mcl;
-
+
/*
* This is basically '__unlazy_fpu', except that we queue a
* multicall to indicate FPU task switch, rather than
@@ -646,7 +646,7 @@ long do_arch_prctl(struct task_struct *t
if (doit) {
/* set the selector to 0 to not confuse
__switch_to */
- asm volatile("movl %0,%%fs" :: "r" (0));
+ asm volatile("movl %0,%%fs" :: "r" (0));
ret = HYPERVISOR_set_segment_base(SEGBASE_FS, addr);
}
@@ -706,7 +706,7 @@ int dump_task_regs(struct task_struct *t
ptregs.ss &= 0xffff;
elf_core_copy_regs(regs, &ptregs);
-
+
boot_option_idle_override = 1;
return 1;
}
===== linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c 1.3 vs edited =====
--- 1.3/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c 2005-04-06 01:37:08 -07:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup.c 2005-04-15 14:40:35 -07:00
@@ -85,7 +85,6 @@ unsigned long xen_override_max_pfn;
struct cpuinfo_x86 boot_cpu_data;
-
unsigned long mmu_cr4_features;
EXPORT_SYMBOL_GPL(mmu_cr4_features);
@@ -385,7 +384,7 @@ static __init void parse_cmdline_early (
disable_apic = 1;
if (!memcmp(from, "noapic", 6))
- skip_ioapic_setp = 1;
+ skip_ioapic_setup = 1;
if (!memcmp(from, "apic", 4)) {
skip_ioapic_setup = 0;
@@ -428,7 +427,7 @@ static __init void parse_cmdline_early (
#ifndef CONFIG_DISCONTIGMEM
static void __init contig_initmem_init(void)
{
- unsigned long bootmap_size, bootmap;
+ unsigned long bootmap_size, bootmap;
/*
* partially used pages are not usable - thus
@@ -606,7 +605,7 @@ void __init setup_arch(char **cmdline_p)
unsigned long low_mem_size;
int i, j;
physdev_op_t op;
-
+
#if 0
ROOT_DEV = old_decode_dev(ORIG_ROOT_DEV);
#else
@@ -759,7 +758,7 @@ void __init setup_arch(char **cmdline_p)
}
}
#endif
- paging_init();
+ paging_init();
/* Make sure we have a large enough P->M table. */
if (end_pfn > xen_start_info.nr_pages) {
@@ -785,7 +784,7 @@ void __init setup_arch(char **cmdline_p)
}
#if 0
- check_ioapic();
+ check_ioapic();
#endif
#ifdef CONFIG_ACPI_BOOT
@@ -803,7 +802,7 @@ void __init setup_arch(char **cmdline_p)
get_smp_config();
init_apic_mappings();
#endif
-
+
/* XXX Disable irqdebug until we have a way to avoid interrupt
* conflicts. */
/* noirqdebug_setup(""); */
@@ -835,7 +834,7 @@ void __init setup_arch(char **cmdline_p)
pci_mem_start = low_mem_size;
#ifdef CONFIG_GART_IOMMU
- iommu_hole_init();
+ iommu_hole_init();
#endif
op.cmd = PHYSDEVOP_SET_IOPL;
===== linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup64.c 1.3 vs edited =====
--- 1.3/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup64.c 2005-04-06 01:37:08 -07:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/setup64.c 2005-04-15 14:40:35 -07:00
@@ -58,7 +58,7 @@ off Disable
*/
int __init nonx_setup(char *str)
{
- if (!strcmp(str, "on")) {
+ if (!strncmp(str, "on", 2)) {
__supported_pte_mask |= _PAGE_NX;
do_not_nx = 0;
} else if (!strncmp(str, "off", 3)) {
@@ -126,18 +126,18 @@ void pda_init(int cpu)
{
pgd_t *old_level4 = (pgd_t *)xen_start_info.pt_base;
struct x8664_pda *pda = &cpu_pda[cpu];
-
+
/* Setup up data that may be needed in __get_free_pages early */
asm volatile("movl %0,%%fs ; movl %0,%%gs" :: "r" (0));
HYPERVISOR_set_segment_base(SEGBASE_GS_KERNEL,
(unsigned long)(cpu_pda + cpu));
-
- pda->me = pda;
- pda->cpunumber = cpu;
- pda->irqcount = -1;
- pda->kernelstack =
- (unsigned long)stack_thread_info() - PDA_STACKOFFSET + THREAD_SIZE;
- pda->active_mm = &init_mm;
+
+ pda->me = pda;
+ pda->cpunumber = cpu;
+ pda->irqcount = -1;
+ pda->kernelstack =
+ (unsigned long)stack_thread_info() - PDA_STACKOFFSET + THREAD_SIZE;
+ pda->active_mm = &init_mm;
pda->mmu_state = 0;
pda->kernel_mode = 1;
@@ -258,7 +258,7 @@ void __init cpu_init (void)
printk("Initializing CPU#%d\n", cpu);
#if 0
- clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);
+ clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE);
#endif
/*
* Initialize the per-CPU GDT with the boot GDT,
@@ -278,12 +278,12 @@ void __init cpu_init (void)
#if 0
memcpy(me->thread.tls_array, cpu_gdt_table[cpu], GDT_ENTRY_TLS_ENTRIES * 8);
-
+
#endif
memcpy(me->thread.tls_array, &get_cpu_gdt_table(cpu)[GDT_ENTRY_TLS_MIN],
GDT_ENTRY_TLS_ENTRIES * 8);
- /*
+ /*
* Delete NT
*/
===== linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/traps.c 1.2 vs edited =====
--- 1.2/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/traps.c 2005-04-02 12:27:09 -08:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/traps.c 2005-04-15 14:40:36 -07:00
@@ -948,7 +948,7 @@ void __init trap_init(void)
#ifdef CONFIG_IA32_EMULATION
set_system_gate(IA32_SYSCALL_VECTOR, ia32_syscall);
#endif
-
+
/*
* Should be a barrier for any external CPU state.
*/
===== linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c 1.3 vs edited =====
--- 1.3/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c 2005-04-06 01:37:08 -07:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c 2005-04-15 14:40:36 -07:00
@@ -416,7 +416,7 @@ void __set_fixmap_user (enum fixed_addre
void __set_fixmap_ma (enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
-{
+{
unsigned long address = __fix_to_virt(idx);
if (idx >= __end_of_fixed_addresses) {
@@ -464,21 +464,21 @@ unsigned long get_machine_pfn(unsigned l
pte_t *pte = pte_offset_kernel(pmd, addr);
return (pte->pte >> PAGE_SHIFT);
-}
+}
/*
* We start using from start_pfn
*/
static __init void *alloc_low_page(unsigned long *phys)
-{
+{
unsigned long pfn = table_end++;
*phys = (pfn << PAGE_SHIFT);
memset((void *) ((pfn << PAGE_SHIFT) + __START_KERNEL_map), 0, PAGE_SIZE);
return (void *)((pfn << PAGE_SHIFT) + __START_KERNEL_map);
-}
+}
#define PTE_SIZE PAGE_SIZE
@@ -500,11 +500,11 @@ void __init phys_pud_init(pud_t *pud, un
pmd_t *pmd;
paddr = address + i*PUD_SIZE;
- if (paddr >= end) {
+ if (paddr >= end) {
for (; i < PTRS_PER_PUD; i++, pud++)
set_pud(pud, __pud(0));
break;
- }
+ }
pmd = alloc_low_page(&pmd_phys);
make_page_readonly(pmd);
@@ -515,11 +515,11 @@ void __init phys_pud_init(pud_t *pud, un
unsigned long pte_phys;
pte_t *pte, *pte_save;
- if (paddr >= end) {
+ if (paddr >= end) {
for (; j < PTRS_PER_PMD; j++, pmd++)
set_pmd(pmd, __pmd(0));
break;
- }
+ }
pte = alloc_low_page(&pte_phys);
pte_save = pte;
for (k = 0; k < PTRS_PER_PTE; pte++, k++, paddr += PTE_SIZE) {
@@ -550,8 +550,8 @@ static void __init find_early_table_spac
{
unsigned long puds, pmds, ptes;
- puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
- pmds = (end + PMD_SIZE - 1) >> PMD_SHIFT;
+ puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
+ pmds = (end + PMD_SIZE - 1) >> PMD_SHIFT;
ptes = (end + PTE_SIZE - 1) >> PAGE_SHIFT;
tables_reserved = round_up(puds*8, PAGE_SIZE) + round_up(pmds * 8, PAGE_SIZE)
@@ -570,12 +570,12 @@ void __init init_memory_mapping(unsigned
Dprintk("init_memory_mapping\n");
- find_early_table_space(end);
+ find_early_table_space(end);
- start = (unsigned long)__va(start);
- end = (unsigned long)__va(end);
+ start = (unsigned long)__va(start);
+ end = (unsigned long)__va(end);
- for (; start < end; start = next) {
+ for (; start < end; start = next) {
unsigned long pud_phys;
pud_t *pud = alloc_low_page(&pud_phys);
make_page_readonly(pud);
@@ -583,9 +583,9 @@ void __init init_memory_mapping(unsigned
next = start + PGDIR_SIZE;
if (next > end)
next = end;
- phys_pud_init(pud, __pa(start), __pa(next));
- set_pgd(pgd_offset_k(start), mk_kernel_pgd(pud_phys));
- }
+ phys_pud_init(pud, __pa(start), __pa(next));
+ set_pgd(pgd_offset_k(start), mk_kernel_pgd(pud_phys));
+ }
early_printk("kernel direct mapping tables upto %lx @ %lx-%lx\n", end,
table_start<<PAGE_SHIFT,
@@ -622,14 +622,14 @@ void __init paging_init(void)
/* unsigned int max_dma; */
/* max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; */
/* if (end_pfn < max_dma) */
- zones_size[ZONE_DMA] = end_pfn;
+ zones_size[ZONE_DMA] = end_pfn;
#if 0
else {
zones_size[ZONE_DMA] = max_dma;
zones_size[ZONE_NORMAL] = end_pfn - max_dma;
- }
+ }
#endif
- free_area_init(zones_size);
+ free_area_init(zones_size);
}
__set_fixmap_ma(FIX_SHARED_INFO, xen_start_info.shared_info,
@@ -672,7 +672,7 @@ void __init clear_kernel_mapping(unsigne
pud = pud_offset(pgd, address);
if (pud_none(*pud))
continue;
- pmd = pmd_offset(pud, address);
+ pmd = pmd_offset(pud, address);
if (!pmd || pmd_none(*pmd))
continue;
if (0 == (pmd_val(*pmd) & _PAGE_PSE)) {
@@ -774,7 +774,7 @@ void __init mem_init(void)
* the WP-bit has been tested.
*/
#ifndef CONFIG_SMP
- zap_low_mappings();
+ zap_low_mappings();
#endif
}
@@ -836,16 +836,16 @@ void __init reserve_bootmem_generic(unsi
int kern_addr_valid(unsigned long addr)
{
- unsigned long above = ((long)addr) >> __VIRTUAL_MASK_SHIFT;
- pgd_t *pgd;
- pud_t *pud;
- pmd_t *pmd;
- pte_t *pte;
+ unsigned long above = ((long)addr) >> __VIRTUAL_MASK_SHIFT;
+ pgd_t *pgd;
+ pud_t *pud;
+ pmd_t *pmd;
+ pte_t *pte;
if (above != 0 && above != -1UL)
return 0;
- pgd = pgd_offset_k(addr);
+ pgd = pgd_offset_k(addr);
if (pgd_none(*pgd))
return 0;
@@ -853,13 +853,13 @@ int kern_addr_valid(unsigned long addr)
if (pud_none(*pud))
return 0;
- pmd = pmd_offset(pud, addr);
+ pmd = pmd_offset(pud, addr);
if (pmd_none(*pmd))
return 0;
if (pmd_large(*pmd))
return pfn_valid(pmd_pfn(*pmd));
- pte = pte_offset_kernel(pmd, addr);
+ pte = pte_offset_kernel(pmd, addr);
if (pte_none(*pte))
return 0;
return pfn_valid(pte_pfn(*pte));
===== linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/ioremap.c 1.3 vs edited =====
--- 1.3/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/ioremap.c 2005-04-06 01:37:08 -07:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/ioremap.c 2005-04-15 14:40:36 -07:00
@@ -112,7 +112,7 @@ void __iomem * __ioremap(unsigned long p
*/
if (is_local_lowmem(phys_addr)) {
char *t_addr, *t_end;
- struct page *page;
+ struct page *page;
t_addr = bus_to_virt(phys_addr);
t_end = t_addr + (size - 1);
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-04-19 21:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-04-19 21:51 [PATCH 0/2] whitespace cleanup in Linux sparse tree Chris Wright
2005-04-19 21:52 ` [PATCH 1/2] i386 " Chris Wright
2005-04-19 21:53 ` [PATCH 2/2] x86_64 " Chris Wright
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.