From 6a91ab674e9ac129c293035b7aba7855ebfbbde9 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Thu, 7 Dec 2006 13:31:07 -0600 Subject: [PATCH] --- yaml --- r: 44177 b: refs/heads/master c: 1083cfe11285816fb2e2e36aad097f1c3b6db915 h: refs/heads/master i: 44175: a9d33bc4509a2d8814a4c1f201fe44d29824d85d v: v3 --- [refs] | 2 +- trunk/drivers/net/ucc_geth.c | 10 +++++----- trunk/fs/proc/proc_misc.c | 12 ++---------- trunk/include/asm-generic/vmlinux.lds.h | 1 - trunk/include/linux/init.h | 1 - trunk/include/linux/kernel.h | 2 ++ trunk/init/initramfs.c | 6 ++---- trunk/init/main.c | 15 ++++++++------- trunk/init/version.c | 5 +++++ 9 files changed, 25 insertions(+), 29 deletions(-) diff --git a/[refs] b/[refs] index 10c075b9305f..272ade6ac3d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d610dd52dd1da696e199e4b4545f33a2a5de5c6 +refs/heads/master: 1083cfe11285816fb2e2e36aad097f1c3b6db915 diff --git a/trunk/drivers/net/ucc_geth.c b/trunk/drivers/net/ucc_geth.c index 1f05511fa390..62d979b0f975 100644 --- a/trunk/drivers/net/ucc_geth.c +++ b/trunk/drivers/net/ucc_geth.c @@ -194,9 +194,9 @@ static void enqueue(struct list_head *node, struct list_head *lh) { unsigned long flags; - spin_lock_irqsave(ugeth_lock, flags); + spin_lock_irqsave(&ugeth_lock, flags); list_add_tail(node, lh); - spin_unlock_irqrestore(ugeth_lock, flags); + spin_unlock_irqrestore(&ugeth_lock, flags); } #endif /* CONFIG_UGETH_FILTERING */ @@ -204,14 +204,14 @@ static struct list_head *dequeue(struct list_head *lh) { unsigned long flags; - spin_lock_irqsave(ugeth_lock, flags); + spin_lock_irqsave(&ugeth_lock, flags); if (!list_empty(lh)) { struct list_head *node = lh->next; list_del(node); - spin_unlock_irqrestore(ugeth_lock, flags); + spin_unlock_irqrestore(&ugeth_lock, flags); return node; } else { - spin_unlock_irqrestore(ugeth_lock, flags); + spin_unlock_irqrestore(&ugeth_lock, flags); return NULL; } } diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c index 92ea7743fe8f..dc3e580d1dca 100644 --- a/trunk/fs/proc/proc_misc.c +++ b/trunk/fs/proc/proc_misc.c @@ -47,7 +47,6 @@ #include #include #include -#include #include #include #include @@ -254,15 +253,8 @@ static int version_read_proc(char *page, char **start, off_t off, { int len; - /* FIXED STRING! Don't touch! */ - len = snprintf(page, PAGE_SIZE, - "%s version %s" - " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")" - " (" LINUX_COMPILER ")" - " %s\n", - utsname()->sysname, - utsname()->release, - utsname()->version); + len = sprintf(page, linux_banner, + utsname()->release, utsname()->version); return proc_calc_metrics(page, start, off, count, eof, len); } diff --git a/trunk/include/asm-generic/vmlinux.lds.h b/trunk/include/asm-generic/vmlinux.lds.h index 7437ccaada77..6e9fcebbf89f 100644 --- a/trunk/include/asm-generic/vmlinux.lds.h +++ b/trunk/include/asm-generic/vmlinux.lds.h @@ -242,7 +242,6 @@ *(.initcall4s.init) \ *(.initcall5.init) \ *(.initcall5s.init) \ - *(.initcallrootfs.init) \ *(.initcall6.init) \ *(.initcall6s.init) \ *(.initcall7.init) \ diff --git a/trunk/include/linux/init.h b/trunk/include/linux/init.h index 5a593a1dec1e..5eb5d24b7680 100644 --- a/trunk/include/linux/init.h +++ b/trunk/include/linux/init.h @@ -111,7 +111,6 @@ extern void setup_arch(char **); #define subsys_initcall_sync(fn) __define_initcall("4s",fn,4s) #define fs_initcall(fn) __define_initcall("5",fn,5) #define fs_initcall_sync(fn) __define_initcall("5s",fn,5s) -#define rootfs_initcall(fn) __define_initcall("rootfs",fn,rootfs) #define device_initcall(fn) __define_initcall("6",fn,6) #define device_initcall_sync(fn) __define_initcall("6s",fn,6s) #define late_initcall(fn) __define_initcall("7",fn,7) diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h index b0c4a05a4b0c..e8bfac34d2ba 100644 --- a/trunk/include/linux/kernel.h +++ b/trunk/include/linux/kernel.h @@ -17,6 +17,8 @@ #include #include +extern const char linux_banner[]; + #define INT_MAX ((int)(~0U>>1)) #define INT_MIN (-INT_MAX - 1) #define UINT_MAX (~0U) diff --git a/trunk/init/initramfs.c b/trunk/init/initramfs.c index 4fa0f7977de1..85f04037ade1 100644 --- a/trunk/init/initramfs.c +++ b/trunk/init/initramfs.c @@ -526,7 +526,7 @@ static void __init free_initrd(void) #endif -static int __init populate_rootfs(void) +void __init populate_rootfs(void) { char *err = unpack_to_rootfs(__initramfs_start, __initramfs_end - __initramfs_start, 0); @@ -544,7 +544,7 @@ static int __init populate_rootfs(void) unpack_to_rootfs((char *)initrd_start, initrd_end - initrd_start, 0); free_initrd(); - return 0; + return; } printk("it isn't (%s); looks like an initrd\n", err); fd = sys_open("/initrd.image", O_WRONLY|O_CREAT, 0700); @@ -565,6 +565,4 @@ static int __init populate_rootfs(void) #endif } #endif - return 0; } -rootfs_initcall(populate_rootfs); diff --git a/trunk/init/main.c b/trunk/init/main.c index e3f0bb20b4dd..036f97c0c34c 100644 --- a/trunk/init/main.c +++ b/trunk/init/main.c @@ -94,6 +94,7 @@ extern void pidmap_init(void); extern void prio_tree_init(void); extern void radix_tree_init(void); extern void free_initmem(void); +extern void populate_rootfs(void); extern void driver_init(void); extern void prepare_namespace(void); #ifdef CONFIG_ACPI @@ -482,12 +483,6 @@ void __init __attribute__((weak)) smp_setup_processor_id(void) { } -static const char linux_banner[] = - "Linux version " UTS_RELEASE - " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")" - " (" LINUX_COMPILER ")" - " " UTS_VERSION "\n"; - asmlinkage void __init start_kernel(void) { char * command_line; @@ -514,7 +509,7 @@ asmlinkage void __init start_kernel(void) boot_cpu_init(); page_address_init(); printk(KERN_NOTICE); - printk(linux_banner); + printk(linux_banner, UTS_RELEASE, UTS_VERSION); setup_arch(&command_line); unwind_setup(); setup_per_cpu_areas(); @@ -744,6 +739,12 @@ static int init(void * unused) cpuset_init_smp(); + /* + * Do this before initcalls, because some drivers want to access + * firmware files. + */ + populate_rootfs(); + do_basic_setup(); /* diff --git a/trunk/init/version.c b/trunk/init/version.c index 9d96d36501ca..2a5dfcd1c2e6 100644 --- a/trunk/init/version.c +++ b/trunk/init/version.c @@ -33,3 +33,8 @@ struct uts_namespace init_uts_ns = { }, }; EXPORT_SYMBOL_GPL(init_uts_ns); + +const char linux_banner[] = + "Linux version %s (" LINUX_COMPILE_BY "@" + LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") %s\n"; +