ChangeSet 1.1332, 2005/04/20 11:23:43+01:00, chrisw@xxxxxxxx
[PATCH] [PATCH 2/2] x86_64 whitespace cleanup in Linux sparse
Eliminate extraneous whitespace changes in x86_64 portion of Linux
sparse patch.
Signed-off-by: Chris Wright <chrisw@xxxxxxxx>
kernel/entry.S | 32 ++++++++++++++---------------
kernel/head.S | 10 ++++-----
kernel/ldt.c | 5 +---
kernel/pci-dma.c | 36 ++++++++++++++++-----------------
kernel/process.c | 8 +++----
kernel/setup.c | 15 ++++++-------
kernel/setup64.c | 24 +++++++++++-----------
kernel/traps.c | 2 -
mm/init.c | 60 +++++++++++++++++++++++++++----------------------------
mm/ioremap.c | 2 -
10 files changed, 96 insertions(+), 98 deletions(-)
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S 2005-04-20
07:02:59 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/entry.S 2005-04-20
07:02:59 -04:00
@@ -108,7 +108,7 @@
#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 @@
1:
.endm
-/*
+/*
* A newly forked process directly context switches into this.
*/
/* rdi: prev */
@@ -276,7 +276,7 @@
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 @@
#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 @@
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 @@
/* 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 @@
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 @@
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 @@
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 @@
je error_swapgs
jmp error_sti
#endif
-
+
ENTRY(hypervisor_callback)
zeroentry do_hypervisor_callback
@@ -896,7 +896,7 @@
.long 3b,8b; \
.long 4b,9b; \
.previous
-
+
.section __ex_table,"a"
.align 8
.quad gs_change,bad_gs
@@ -1051,7 +1051,7 @@
CFI_ENDPROC
#if 0
- /* runs on exception stack */
+ /* runs on exception stack */
ENTRY(nmi)
CFI_STARTPROC
pushq $-1
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S 2005-04-20
07:02:59 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/head.S 2005-04-20
07:02:59 -04: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 @@
pushq %rax
lretq
#endif
-
+
ENTRY(stext)
ENTRY(_stext)
@@ -113,7 +113,7 @@
.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 @@
.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 @@
* IRET will check the segment types kkeil 2000/10/28
* Also sysret mandates a special GDT layout
*/
-
+
#if 0
.align L1_CACHE_BYTES
#endif
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/ldt.c
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/ldt.c
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/ldt.c 2005-04-20
07:02:59 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/ldt.c 2005-04-20
07:02:59 -04: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
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/pci-dma.c
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/pci-dma.c
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/pci-dma.c 2005-04-20
07:02:59 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/pci-dma.c 2005-04-20
07:02:59 -04: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 @@
* 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 {
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/process.c
b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/process.c
--- a/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/process.c 2005-04-20
07:02:59 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/x86_64/kernel/process.c 2005-04-20
07:02:59 -04:00
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home