4 files changed, 54 insertions, 106 deletions

diff --git a/arch/alpha/kernel/srm_env.c b/arch/alpha/kernel/srm_env.c
index 990ac61028f8..f7dd081d57ff 100644
--- a/arch/alpha/kernel/srm_env.c
+++ b/arch/alpha/kernel/srm_env.c
@@ -2,7 +2,7 @@
  * srm_env.c - Access to SRM environment
  *             variables through linux' procfs
  *
- * Copyright (C) 2001-2002 Jan-Benedict Glaw <jbglaw@lug-owl.de>
+ * (C) 2001,2002,2006 by Jan-Benedict Glaw <jbglaw@lug-owl.de>
  *
  * This driver is at all a modified version of Erik Mouw's
  * Documentation/DocBook/procfs_example.c, so: thank
@@ -21,7 +21,7 @@
  * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
  * PURPOSE.  See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
  * Free Software Foundation, Inc., 59 Temple Place,
@@ -29,33 +29,6 @@
  *
  */
 
-/*
- * Changelog
- * ~~~~~~~~~
- *
- * Thu, 22 Aug 2002 15:10:43 +0200
- *      - Update Config.help entry. I got a number of emails asking
- *        me to tell their senders if they could make use of this
- *        piece of code... So: "SRM is something like BIOS for your
- *        Alpha"
- *      - Update code formatting a bit to better conform CodingStyle
- *        rules.
- *      - So this is v0.0.5, with no changes (except formatting)
- *      
- * Wed, 22 May 2002 00:11:21 +0200
- *      - Fix typo on comment (SRC -> SRM)
- *      - Call this "Version 0.0.4"
- *
- * Tue,  9 Apr 2002 18:44:40 +0200
- *      - Implement access by variable name and additionally
- *        by number. This is done by creating two subdirectories
- *        where one holds all names (like the old directory
- *        did) and the other holding 256 files named like "0",
- *        "1" and so on.
- *      - Call this "Version 0.0.3"
- *
- */
-
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -67,7 +40,7 @@
 #define BASE_DIR        "srm_environment"       /* Subdir in /proc/             */
 #define NAMED_DIR       "named_variables"       /* Subdir for known variables   */
 #define NUMBERED_DIR    "numbered_variables"    /* Subdir for all variables     */
-#define VERSION         "0.0.5"                 /* Module version               */
+#define VERSION         "0.0.6"                 /* Module version               */
 #define NAME            "srm_env"               /* Module name                  */
 
 MODULE_AUTHOR("Jan-Benedict Glaw <jbglaw@lug-owl.de>");
@@ -106,7 +79,6 @@ static srm_env_t	srm_named_entries[] = {
 static srm_env_t        srm_numbered_entries[256];
 
 
-
 static int
 srm_env_read(char *page, char **start, off_t off, int count, int *eof,
                 void *data)
@@ -115,21 +87,23 @@ srm_env_read(char *page, char **start, off_t off, int count, int *eof,
         unsigned long   ret;
         srm_env_t       *entry;
 
-        if(off != 0)
-                return -EFAULT;
+        if (off != 0) {
+                *eof = 1;
+                return 0;
+        }
 
         entry   = (srm_env_t *) data;
         ret     = callback_getenv(entry->id, page, count);
 
-        if((ret >> 61) == 0)
+        if ((ret >> 61) == 0) {
                 nbytes = (int) ret;
-        else
+                *eof = 1;
+        } else
                 nbytes = -EFAULT;
 
         return nbytes;
 }
 
-
 static int
 srm_env_write(struct file *file, const char __user *buffer, unsigned long count,
                 void *data)
@@ -155,7 +129,7 @@ srm_env_write(struct file *file, const char __user *buffer, unsigned long count,
 
         ret1 = callback_setenv(entry->id, buf, count);
         if ((ret1 >> 61) == 0) {
-                do 
+                do
                         ret2 = callback_save_env();
                 while((ret2 >> 61) == 1);
                 res = (int) ret1;
@@ -172,14 +146,14 @@ srm_env_cleanup(void)
         srm_env_t       *entry;
         unsigned long   var_num;
 
-        if(base_dir) {
+        if (base_dir) {
                 /*
                  * Remove named entries
                  */
-                if(named_dir) {
+                if (named_dir) {
                         entry = srm_named_entries;
-                        while(entry->name != NULL && entry->id != 0) {
-                                if(entry->proc_entry) {
+                        while (entry->name != NULL && entry->id != 0) {
+                                if (entry->proc_entry) {
                                         remove_proc_entry(entry->name,
                                                         named_dir);
                                         entry->proc_entry = NULL;
@@ -192,11 +166,11 @@ srm_env_cleanup(void)
                 /*
                  * Remove numbered entries
                  */
-                if(numbered_dir) {
-                        for(var_num = 0; var_num <= 255; var_num++) {
+                if (numbered_dir) {
+                        for (var_num = 0; var_num <= 255; var_num++) {
                                 entry = &srm_numbered_entries[var_num];
 
-                                if(entry->proc_entry) {
+                                if (entry->proc_entry) {
                                         remove_proc_entry(entry->name,
                                                         numbered_dir);
                                         entry->proc_entry       = NULL;
@@ -212,7 +186,6 @@ srm_env_cleanup(void)
         return;
 }
 
-
 static int __init
 srm_env_init(void)
 {
@@ -222,7 +195,7 @@ srm_env_init(void)
         /*
          * Check system
          */
-        if(!alpha_using_srm) {
+        if (!alpha_using_srm) {
                 printk(KERN_INFO "%s: This Alpha system doesn't "
                                 "know about SRM (or you've booted "
                                 "SRM->MILO->Linux, which gets "
@@ -233,14 +206,14 @@ srm_env_init(void)
         /*
          * Init numbers
          */
-        for(var_num = 0; var_num <= 255; var_num++)
+        for (var_num = 0; var_num <= 255; var_num++)
                 sprintf(number[var_num], "%ld", var_num);
 
         /*
          * Create base directory
          */
         base_dir = proc_mkdir(BASE_DIR, NULL);
-        if(base_dir == NULL) {
+        if (!base_dir) {
                 printk(KERN_ERR "Couldn't create base dir /proc/%s\n",
                                 BASE_DIR);
                 goto cleanup;
@@ -251,7 +224,7 @@ srm_env_init(void)
          * Create per-name subdirectory
          */
         named_dir = proc_mkdir(NAMED_DIR, base_dir);
-        if(named_dir == NULL) {
+        if (!named_dir) {
                 printk(KERN_ERR "Couldn't create dir /proc/%s/%s\n",
                                 BASE_DIR, NAMED_DIR);
                 goto cleanup;
@@ -262,7 +235,7 @@ srm_env_init(void)
          * Create per-number subdirectory
          */
         numbered_dir = proc_mkdir(NUMBERED_DIR, base_dir);
-        if(numbered_dir == NULL) {
+        if (!numbered_dir) {
                 printk(KERN_ERR "Couldn't create dir /proc/%s/%s\n",
                                 BASE_DIR, NUMBERED_DIR);
                 goto cleanup;
@@ -274,10 +247,10 @@ srm_env_init(void)
          * Create all named nodes
          */
         entry = srm_named_entries;
-        while(entry->name != NULL && entry->id != 0) {
+        while (entry->name && entry->id) {
                 entry->proc_entry = create_proc_entry(entry->name,
                                 0644, named_dir);
-                if(entry->proc_entry == NULL)
+                if (!entry->proc_entry)
                         goto cleanup;
 
                 entry->proc_entry->data         = (void *) entry;
@@ -291,13 +264,13 @@ srm_env_init(void)
         /*
          * Create all numbered nodes
          */
-        for(var_num = 0; var_num <= 255; var_num++) {
+        for (var_num = 0; var_num <= 255; var_num++) {
                 entry = &srm_numbered_entries[var_num];
                 entry->name = number[var_num];
 
                 entry->proc_entry = create_proc_entry(entry->name,
                                 0644, numbered_dir);
-                if(entry->proc_entry == NULL)
+                if (!entry->proc_entry)
                         goto cleanup;
 
                 entry->id                       = var_num;
@@ -318,7 +291,6 @@ cleanup:
         return -ENOMEM;
 }
 
-
 static void __exit
 srm_env_exit(void)
 {
@@ -328,7 +300,5 @@ srm_env_exit(void)
         return;
 }
 
-
 module_init(srm_env_init);
 module_exit(srm_env_exit);
-
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index 71470e9d93ba..76bf071e376c 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -48,13 +48,7 @@ SECTIONS
   . = ALIGN(8);
   __initcall_start = .;
   .initcall.init : {
-        *(.initcall1.init) 
-        *(.initcall2.init) 
-        *(.initcall3.init) 
-        *(.initcall4.init) 
-        *(.initcall5.init) 
-        *(.initcall6.init) 
-        *(.initcall7.init)
+        INITCALLS
   }
   __initcall_end = .;
 
diff --git a/arch/alpha/lib/checksum.c b/arch/alpha/lib/checksum.c
index 89044e6385fe..ab3761c437a8 100644
--- a/arch/alpha/lib/checksum.c
+++ b/arch/alpha/lib/checksum.c
@@ -41,28 +41,25 @@ static inline unsigned short from64to16(unsigned long x)
  * computes the checksum of the TCP/UDP pseudo-header
  * returns a 16-bit checksum, already complemented.
  */
-unsigned short int csum_tcpudp_magic(unsigned long saddr,
-                                   unsigned long daddr,
+__sum16 csum_tcpudp_magic(__be32 saddr, __be32 daddr,
                                    unsigned short len,
                                    unsigned short proto,
-                                   unsigned int sum)
+                                   __wsum sum)
 {
-        return ~from64to16(saddr + daddr + sum +
-                ((unsigned long) ntohs(len) << 16) +
-                ((unsigned long) proto << 8));
+        return (__force __sum16)~from64to16(
+                (__force u64)saddr + (__force u64)daddr +
+                (__force u64)sum + ((len + proto) << 8));
 }
 
-unsigned int csum_tcpudp_nofold(unsigned long saddr,
-                                   unsigned long daddr,
+__wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr,
                                    unsigned short len,
                                    unsigned short proto,
-                                   unsigned int sum)
+                                   __wsum sum)
 {
         unsigned long result;
 
-        result = (saddr + daddr + sum +
-                  ((unsigned long) ntohs(len) << 16) +
-                  ((unsigned long) proto << 8));
+        result = (__force u64)saddr + (__force u64)daddr +
+                 (__force u64)sum + ((len + proto) << 8);
 
         /* Fold down to 32-bits so we don't lose in the typedef-less 
            network stack.  */
@@ -70,7 +67,7 @@ unsigned int csum_tcpudp_nofold(unsigned long saddr,
         result = (result & 0xffffffff) + (result >> 32);
         /* 33 to 32 */
         result = (result & 0xffffffff) + (result >> 32);
-        return result;
+        return (__force __wsum)result;
 }
 
 /*
@@ -146,9 +143,9 @@ out:
  *      This is a version of ip_compute_csum() optimized for IP headers,
  *      which always checksum on 4 octet boundaries.
  */
-unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl)
+__sum16 ip_fast_csum(const void *iph, unsigned int ihl)
 {
-        return ~do_csum(iph,ihl*4);
+        return (__force __sum16)~do_csum(iph,ihl*4);
 }
 
 /*
@@ -163,15 +160,15 @@ unsigned short ip_fast_csum(unsigned char * iph, unsigned int ihl)
  *
  * it's best to have buff aligned on a 32-bit boundary
  */
-unsigned int csum_partial(const unsigned char * buff, int len, unsigned int sum)
+__wsum csum_partial(const void *buff, int len, __wsum sum)
 {
         unsigned long result = do_csum(buff, len);
 
         /* add in old sum, and carry.. */
-        result += sum;
+        result += (__force u32)sum;
         /* 32+c bits -> 32 bits */
         result = (result & 0xffffffff) + (result >> 32);
-        return result;
+        return (__force __wsum)result;
 }
 
 EXPORT_SYMBOL(csum_partial);
@@ -180,7 +177,7 @@ EXPORT_SYMBOL(csum_partial);
  * this routine is used for miscellaneous IP-like checksums, mainly
  * in icmp.c
  */
-unsigned short ip_compute_csum(unsigned char * buff, int len)
+__sum16 ip_compute_csum(const void *buff, int len)
 {
-        return ~from64to16(do_csum(buff,len));
+        return (__force __sum16)~from64to16(do_csum(buff,len));
 }
diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c
index a37948f3037a..4ca75c74ce90 100644
--- a/arch/alpha/lib/csum_partial_copy.c
+++ b/arch/alpha/lib/csum_partial_copy.c
@@ -329,11 +329,11 @@ csum_partial_cfu_unaligned(const unsigned long __user * src,
         return checksum;
 }
 
-static unsigned int
-do_csum_partial_copy_from_user(const char __user *src, char *dst, int len,
-                               unsigned int sum, int *errp)
+__wsum
+csum_partial_copy_from_user(const void __user *src, void *dst, int len,
+                               __wsum sum, int *errp)
 {
-        unsigned long checksum = (unsigned) sum;
+        unsigned long checksum = (__force u32) sum;
         unsigned long soff = 7 & (unsigned long) src;
         unsigned long doff = 7 & (unsigned long) dst;
 
@@ -367,25 +367,12 @@ do_csum_partial_copy_from_user(const char __user *src, char *dst, int len,
                 }
                 checksum = from64to16 (checksum);
         }
-        return checksum;
-}
-
-unsigned int
-csum_partial_copy_from_user(const char __user *src, char *dst, int len,
-                            unsigned int sum, int *errp)
-{
-        if (!access_ok(VERIFY_READ, src, len)) {
-                *errp = -EFAULT;
-                memset(dst, 0, len);
-                return sum;
-        }
-
-        return do_csum_partial_copy_from_user(src, dst, len, sum, errp);
+        return (__force __wsum)checksum;
 }
 
-unsigned int
-csum_partial_copy_nocheck(const char __user *src, char *dst, int len,
-                          unsigned int sum)
+__wsum
+csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum)
 {
-        return do_csum_partial_copy_from_user(src, dst, len, sum, NULL);
+        return csum_partial_copy_from_user((__force const void __user *)src,
+                        dst, len, sum, NULL);
 }