diff -ur ../../../kernel/power/swsusp.c kernel/power/swsusp.c --- ../../../kernel/power/swsusp.c 2004-12-05 16:11:19.000000000 +0000 +++ kernel/power/swsusp.c 2004-12-05 18:31:40.000000000 +0000 @@ -907,7 +907,7 @@ /* * Returns true if given address/order collides with any orig_address */ -static int __init does_collide_order(suspend_pagedir_t *pagedir, unsigned long addr, +static int does_collide_order(suspend_pagedir_t *pagedir, unsigned long addr, int order) { int i; @@ -925,7 +925,7 @@ * We check here that pagedir & pages it points to won't collide with pages * where we're going to restore from the loaded pages later */ -static int __init check_pagedir(void) +static int check_pagedir(void) { int i; @@ -943,7 +943,7 @@ return 0; } -static int __init swsusp_pagedir_relocate(void) +static int swsusp_pagedir_relocate(void) { /* * We have to avoid recursion (not to overflow kernel stack), @@ -1075,7 +1075,7 @@ * I really don't think that it's foolproof but more than nothing.. */ -static const char * __init sanity_check(void) +static const char * sanity_check(void) { dump_info(); if(swsusp_info.version_code != LINUX_VERSION_CODE) @@ -1096,7 +1096,7 @@ } -static int __init check_header(void) +static int check_header(void) { const char * reason = NULL; int error; @@ -1113,7 +1113,7 @@ return error; } -static int __init check_sig(void) +static int check_sig(void) { int error; @@ -1143,7 +1143,7 @@ * already did that. */ -static int __init data_read(void) +static int data_read(void) { struct pbe * p; int error; @@ -1170,7 +1170,7 @@ extern dev_t __init name_to_dev_t(const char *line); -static int __init read_pagedir(void) +static int read_pagedir(void) { unsigned long addr; int i, n = swsusp_info.pagedir_pages; @@ -1197,7 +1197,7 @@ return error; } -static int __init read_suspend_image(void) +static int read_suspend_image(void) { int error = 0; @@ -1216,7 +1216,7 @@ * pmdisk_read - Read saved image from swap. */ -int __init swsusp_read(void) +int swsusp_read(void) { int error;