[ARM] Bring asm/setup.h and asm/unistd.h into line with main ARM tree

This removes some minor differences between Linus' tree and the main
ARM tree; comment clarification and some weird formatting.

diff --git a/include/asm-arm/setup.h b/include/asm-arm/setup.h
index 1e1002711665682829b87a01558301ff7dac31c1..38f4ba0ecc676931fffa8002c9e303e46d36039f 100644 (file)
--- a/include/asm-arm/setup.h
+++ b/include/asm-arm/setup.h
@@ -65,14 +65,14 @@ struct tag_ramdisk {
        u32 start;      /* starting block of floppy-based RAM disk image */
 };
 
-/* describes where the compressed ramdisk image lives */
+/* describes where the compressed ramdisk image lives (virtual address) */
 /*
  * this one accidentally used virtual addresses - as such,
  * its depreciated.
  */
 #define ATAG_INITRD    0x54410005
 
-/* describes where the compressed ramdisk image lives */
+/* describes where the compressed ramdisk image lives (physical address) */
 #define ATAG_INITRD2   0x54420005
 
 struct tag_initrd {

diff --git a/include/asm-arm/unistd.h b/include/asm-arm/unistd.h
index 92a7a982518b96f2d96107550fe1bc18aa3f700f..32d3f3bff93b6ba96304ec8915c9216aa0864595 100644 (file)
--- a/include/asm-arm/unistd.h
+++ b/include/asm-arm/unistd.h
@@ -308,14 +308,14 @@ type name(void) {                                                 \
   __syscall_return(type,__res);                                                \
 }
 
-#define _syscall1(type,name,type1,arg1)                                        \
-type name(type1 arg1) {                                                        \
+#define _syscall1(type,name,type1,arg1)                                \
+type name(type1 arg1) {                                                \
   register long __r0 __asm__("r0") = (long)arg1;                       \
   register long __res __asm__("r0");                                   \
   __asm__ __volatile__ (                                               \
   __syscall(name)                                                      \
-        : "=r" (__res)                                                 \
-        : "r" (__r0)                                                   \
+       : "=r" (__res)                                                  \
+       : "r" (__r0)                                                    \
        : "lr");                                                        \
   __syscall_return(type,__res);                                                \
 }
@@ -327,8 +327,8 @@ type name(type1 arg1,type2 arg2) {                                  \
   register long __res __asm__("r0");                                   \
   __asm__ __volatile__ (                                               \
   __syscall(name)                                                      \
-        : "=r" (__res)                                                 \
-        : "r" (__r0),"r" (__r1)                                                \
+       : "=r" (__res)                                                  \
+       : "r" (__r0),"r" (__r1)                                         \
        : "lr");                                                        \
   __syscall_return(type,__res);                                                \
 }
@@ -342,8 +342,8 @@ type name(type1 arg1,type2 arg2,type3 arg3) {                               \
   register long __res __asm__("r0");                                   \
   __asm__ __volatile__ (                                               \
   __syscall(name)                                                      \
-        : "=r" (__res)                                                 \
-       : "r" (__r0),"r" (__r1),"r" (__r2)                              \
+       : "=r" (__res)                                                  \
+       : "r" (__r0),"r" (__r1),"r" (__r2)                              \
        : "lr");                                                        \
   __syscall_return(type,__res);                                                \
 }
@@ -358,8 +358,8 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4) {         \
   register long __res __asm__("r0");                                   \
   __asm__ __volatile__ (                                               \
   __syscall(name)                                                      \
-       : "=r" (__res)                                                  \
-       : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3)                   \
+       : "=r" (__res)                                                  \
+       : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3)                   \
        : "lr");                                                        \
   __syscall_return(type,__res);                                                \
 }
@@ -375,8 +375,8 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) {     \
   register long __res __asm__("r0");                                   \
   __asm__ __volatile__ (                                               \
   __syscall(name)                                                      \
-       : "=r" (__res)                                                  \
-       : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3),"r" (__r4)        \
+       : "=r" (__res)                                                  \
+       : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3),"r" (__r4)        \
        : "lr");                                                        \
   __syscall_return(type,__res);                                                \
 }
@@ -392,7 +392,7 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6
   register long __res __asm__("r0");                                   \
   __asm__ __volatile__ (                                               \
   __syscall(name)                                                      \
-       : "=r" (__res)                                                  \
+       : "=r" (__res)                                                  \
        : "r" (__r0),"r" (__r1),"r" (__r2),"r" (__r3), "r" (__r4),"r" (__r5)            \
        : "lr");                                                        \
   __syscall_return(type,__res);                                                \