Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a5ed1ffa6c2480cdcf3f0aa945f0b8622fe4e90b
Commit:     a5ed1ffa6c2480cdcf3f0aa945f0b8622fe4e90b
Parent:     11100b1dfb6e9444d54d38e822753f59ee42a7e6
Author:     Jeff Dike <[EMAIL PROTECTED]>
AuthorDate: Sun May 6 14:50:58 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon May 7 12:13:00 2007 -0700

    uml: formatting fixes
    
    Formatting fixes -
        style violations
        whitespace breakage
        emacs formatting comment removal
    
    Signed-off-by: Jeff Dike <[EMAIL PROTECTED]>
    Cc: Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 arch/um/kernel/um_arch.c  |   51 ++++++++++++++++++++---------------------
 arch/um/os-Linux/main.c   |   11 +++++----
 arch/um/sys-i386/bugs.c   |   54 ++++++++++++++++++++-------------------------
 arch/um/sys-x86_64/bugs.c |   34 ++++++++++------------------
 4 files changed, 67 insertions(+), 83 deletions(-)

diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 89c6dba..299d75a 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -63,8 +63,8 @@ struct cpuinfo_um boot_cpu_data = {
 
 unsigned long thread_saved_pc(struct task_struct *task)
 {
-       return(os_process_pc(CHOOSE_MODE_PROC(thread_pid_tt, thread_pid_skas,
-                                             task)));
+       return os_process_pc(CHOOSE_MODE_PROC(thread_pid_tt, thread_pid_skas,
+                                             task));
 }
 
 static int show_cpuinfo(struct seq_file *m, void *v)
@@ -86,7 +86,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                   loops_per_jiffy/(500000/HZ),
                   (loops_per_jiffy/(5000/HZ)) % 100);
 
-       return(0);
+       return 0;
 }
 
 static void *c_start(struct seq_file *m, loff_t *pos)
@@ -212,12 +212,12 @@ __uml_setup("debug", no_skas_debug_setup,
 #ifdef CONFIG_SMP
 static int __init uml_ncpus_setup(char *line, int *add)
 {
-       if (!sscanf(line, "%d", &ncpus)) {
-               printf("Couldn't parse [%s]\n", line);
-               return -1;
-       }
+       if (!sscanf(line, "%d", &ncpus)) {
+               printf("Couldn't parse [%s]\n", line);
+               return -1;
+       }
 
-       return 0;
+       return 0;
 }
 
 __uml_setup("ncpus=", uml_ncpus_setup,
@@ -234,7 +234,7 @@ static int force_tt = 0;
 static int __init mode_tt_setup(char *line, int *add)
 {
        force_tt = 1;
-       return(0);
+       return 0;
 }
 
 #else
@@ -245,7 +245,7 @@ static int __init mode_tt_setup(char *line, int *add)
 static int __init mode_tt_setup(char *line, int *add)
 {
        printf("CONFIG_MODE_TT disabled - 'mode=tt' ignored\n");
-       return(0);
+       return 0;
 }
 
 #else
@@ -256,7 +256,7 @@ static int __init mode_tt_setup(char *line, int *add)
 static int __init mode_tt_setup(char *line, int *add)
 {
        printf("CONFIG_MODE_SKAS disabled - 'mode=tt' redundant\n");
-       return(0);
+       return 0;
 }
 
 #endif
@@ -274,16 +274,15 @@ int mode_tt = DEFAULT_TT;
 
 static int __init Usage(char *line, int *add)
 {
-       const char **p;
+       const char **p;
 
        printf(usage_string, init_utsname()->release);
-       p = &__uml_help_start;
-       while (p < &__uml_help_end) {
-               printf("%s", *p);
-               p++;
-       }
+       p = &__uml_help_start;
+       while (p < &__uml_help_end) {
+               printf("%s", *p);
+               p++;
+       }
        exit(0);
-
        return 0;
 }
 
@@ -379,8 +378,8 @@ int __init linux_main(int argc, char **argv)
                                          set_task_sizes_skas, &task_size);
 
        /*
-        * Setting up handlers to 'sig_info' struct
-        */
+        * Setting up handlers to 'sig_info' struct
+        */
        os_fill_handlinfo(handlinfo_kern);
 
        brk_start = (unsigned long) sbrk(0);
@@ -407,7 +406,7 @@ int __init linux_main(int argc, char **argv)
        argv1_begin = argv[1];
        argv1_end = &argv[1][strlen(argv[1])];
 #endif
-  
+
        highmem = 0;
        iomem_size = (iomem_size + PAGE_SIZE - 1) & PAGE_MASK;
        max_physmem = get_kmem_end() - uml_physmem - iomem_size - MIN_VMALLOC;
@@ -449,12 +448,12 @@ int __init linux_main(int argc, char **argv)
                printf("Kernel virtual memory size shrunk to %lu bytes\n",
                       virtmem_size);
 
-       uml_postsetup();
+       uml_postsetup();
 
        task_protections((unsigned long) &init_thread_info);
        os_flush_stdout();
 
-       return(CHOOSE_MODE(start_uml_tt(), start_uml_skas()));
+       return CHOOSE_MODE(start_uml_tt(), start_uml_skas());
 }
 
 extern int uml_exitcode;
@@ -467,7 +466,7 @@ static int panic_exit(struct notifier_block *self, unsigned 
long unused1,
        bust_spinlocks(0);
        uml_exitcode = 1;
        machine_halt();
-       return(0);
+       return 0;
 }
 
 static struct notifier_block panic_exit_notifier = {
@@ -482,14 +481,14 @@ void __init setup_arch(char **cmdline_p)
                        &panic_exit_notifier);
        paging_init();
        strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
-       *cmdline_p = command_line;
+       *cmdline_p = command_line;
        setup_hostinfo();
 }
 
 void __init check_bugs(void)
 {
        arch_check_bugs();
-       os_check_bugs();
+       os_check_bugs();
 }
 
 void apply_alternatives(struct alt_instr *start, struct alt_instr *end)
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index 7aa4c2a..2c089c2 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -218,7 +218,7 @@ int main(int argc, char **argv, char **envp)
                ret = 1;
        }
        printf("\n");
-       return(uml_exitcode);
+       return uml_exitcode;
 }
 
 #define CAN_KMALLOC() \
@@ -231,7 +231,7 @@ void *__wrap_malloc(int size)
        void *ret;
 
        if(!CAN_KMALLOC())
-               return(__real_malloc(size));
+               return __real_malloc(size);
        else if(size <= PAGE_SIZE) /* finding contiguos pages can be hard*/
                ret = um_kmalloc(size);
        else ret = um_vmalloc(size);
@@ -242,16 +242,17 @@ void *__wrap_malloc(int size)
        if(ret == NULL)
                errno = ENOMEM;
 
-       return(ret);
+       return ret;
 }
 
 void *__wrap_calloc(int n, int size)
 {
        void *ptr = __wrap_malloc(n * size);
 
-       if(ptr == NULL) return(NULL);
+       if(ptr == NULL)
+               return NULL;
        memset(ptr, 0, n * size);
-       return(ptr);
+       return ptr;
 }
 
 extern void __real_free(void *);
diff --git a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c
index e524a08..cae0af1 100644
--- a/arch/um/sys-i386/bugs.c
+++ b/arch/um/sys-i386/bugs.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2002 Jeff Dike ([EMAIL PROTECTED])
  * Licensed under the GPL
  */
@@ -32,21 +32,21 @@ static char token(int fd, char *buf, int len, char stop)
                n = os_read_file(fd, ptr, sizeof(*ptr));
                c = *ptr++;
                if(n != sizeof(*ptr)){
-                       if(n == 0) return(0);
+                       if(n == 0)
+                               return 0;
                        printk("Reading /proc/cpuinfo failed, err = %d\n", -n);
                        if(n < 0)
-                               return(n);
-                       else
-                               return(-EIO);
+                               return n;
+                       else return -EIO;
                }
        } while((c != '\n') && (c != stop) && (ptr < end));
 
        if(ptr == end){
                printk("Failed to find '%c' in /proc/cpuinfo\n", stop);
-               return(-1);
+               return -1;
        }
        *(ptr - 1) = '\0';
-       return(c);
+       return c;
 }
 
 static int find_cpuinfo_line(int fd, char *key, char *scratch, int len)
@@ -58,25 +58,25 @@ static int find_cpuinfo_line(int fd, char *key, char 
*scratch, int len)
        while(1){
                c = token(fd, scratch, len - 1, ':');
                if(c <= 0)
-                       return(0);
+                       return 0;
                else if(c != ':'){
                        printk("Failed to find ':' in /proc/cpuinfo\n");
-                       return(0);
+                       return 0;
                }
 
                if(!strncmp(scratch, key, strlen(key)))
-                       return(1);
+                       return 1;
 
                do {
                        n = os_read_file(fd, &c, sizeof(c));
                        if(n != sizeof(c)){
                                printk("Failed to find newline in "
                                       "/proc/cpuinfo, err = %d\n", -n);
-                               return(0);
+                               return 0;
                        }
                } while(c != '\n');
        }
-       return(0);
+       return 0;
 }
 
 static int check_cpu_flag(char *feature, int *have_it)
@@ -96,7 +96,8 @@ static int check_cpu_flag(char *feature, int *have_it)
                goto out;
 
        c = token(fd, buf, len - 1, ' ');
-       if(c < 0) goto out;
+       if(c < 0)
+               goto out;
        else if(c != ' '){
                printk("Failed to find ' ' in /proc/cpuinfo\n");
                goto out;
@@ -104,7 +105,8 @@ static int check_cpu_flag(char *feature, int *have_it)
 
        while(1){
                c = token(fd, buf, len - 1, ' ');
-               if(c < 0) goto out;
+               if(c < 0)
+                       goto out;
                else if(c == '\n') break;
 
                if(!strcmp(buf, feature)){
@@ -113,8 +115,10 @@ static int check_cpu_flag(char *feature, int *have_it)
                }
        }
  out:
-       if(*have_it == 0) printk("No\n");
-       else if(*have_it == 1) printk("Yes\n");
+       if(*have_it == 0)
+               printk("No\n");
+       else if(*have_it == 1)
+               printk("Yes\n");
        os_close_file(fd);
        return 1;
 }
@@ -166,12 +170,13 @@ int arch_handle_signal(int sig, union uml_pt_regs *regs)
        /* This is testing for a cmov (0x0f 0x4x) instruction causing a
         * SIGILL in init.
         */
-       if((sig != SIGILL) || (TASK_PID(get_current()) != 1)) return(0);
+       if((sig != SIGILL) || (TASK_PID(get_current()) != 1))
+               return 0;
 
        if (copy_from_user_proc(tmp, (void *) UPT_IP(regs), 2))
                panic("SIGILL in init, could not read instructions!\n");
        if((tmp[0] != 0x0f) || ((tmp[1] & 0xf0) != 0x40))
-               return(0);
+               return 0;
 
        if(host_has_cmov == 0)
                panic("SIGILL caused by cmov, which this processor doesn't "
@@ -185,16 +190,5 @@ int arch_handle_signal(int sig, union uml_pt_regs *regs)
                      "implements it, boot a filesystem compiled for older "
                      "processors");
        else panic("Bad value for host_has_cmov (%d)", host_has_cmov);
-       return(0);
+       return 0;
 }
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/sys-x86_64/bugs.c b/arch/um/sys-x86_64/bugs.c
index 73ca623..9fa5392 100644
--- a/arch/um/sys-x86_64/bugs.c
+++ b/arch/um/sys-x86_64/bugs.c
@@ -21,7 +21,7 @@ void arch_check_bugs(void)
 
 int arch_handle_signal(int sig, union uml_pt_regs *regs)
 {
-       return(0);
+       return 0;
 }
 
 #define MAXTOKEN 64
@@ -41,21 +41,21 @@ static char token(int fd, char *buf, int len, char stop)
                n = os_read_file(fd, ptr, sizeof(*ptr));
                c = *ptr++;
                if(n != sizeof(*ptr)){
-                       if(n == 0) return(0);
+                       if(n == 0)
+                               return 0;
                        printk("Reading /proc/cpuinfo failed, err = %d\n", -n);
                        if(n < 0)
-                               return(n);
-                       else
-                               return(-EIO);
+                               return n;
+                       else return -EIO;
                }
        } while((c != '\n') && (c != stop) && (ptr < end));
 
        if(ptr == end){
                printk("Failed to find '%c' in /proc/cpuinfo\n", stop);
-               return(-1);
+               return -1;
        }
        *(ptr - 1) = '\0';
-       return(c);
+       return c;
 }
 
 static int find_cpuinfo_line(int fd, char *key, char *scratch, int len)
@@ -67,33 +67,23 @@ static int find_cpuinfo_line(int fd, char *key, char 
*scratch, int len)
        while(1){
                c = token(fd, scratch, len - 1, ':');
                if(c <= 0)
-                       return(0);
+                       return 0;
                else if(c != ':'){
                        printk("Failed to find ':' in /proc/cpuinfo\n");
-                       return(0);
+                       return 0;
                }
 
                if(!strncmp(scratch, key, strlen(key)))
-                       return(1);
+                       return 1;
 
                do {
                        n = os_read_file(fd, &c, sizeof(c));
                        if(n != sizeof(c)){
                                printk("Failed to find newline in "
                                       "/proc/cpuinfo, err = %d\n", -n);
-                               return(0);
+                               return 0;
                        }
                } while(c != '\n');
        }
-       return(0);
+       return 0;
 }
-
-/* Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to