changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason. use system_utsname for progress and debug header
Signed-off-by: Olaf Hering <[EMAIL PROTECTED]> arch/ppc64/kernel/btext.c | 1 - arch/ppc64/kernel/pSeries_setup.c | 4 ++-- arch/ppc64/kernel/prom.c | 1 - arch/ppc64/kernel/prom_init.c | 1 - arch/ppc64/kernel/setup.c | 4 ++-- arch/ppc64/kernel/vio.c | 1 - 6 files changed, 4 insertions(+), 8 deletions(-) Index: linux-2.6.13-rc2-mm1/arch/ppc64/kernel/btext.c =================================================================== --- linux-2.6.13-rc2-mm1.orig/arch/ppc64/kernel/btext.c +++ linux-2.6.13-rc2-mm1/arch/ppc64/kernel/btext.c @@ -7,7 +7,6 @@ #include <linux/kernel.h> #include <linux/string.h> #include <linux/init.h> -#include <linux/version.h> #include <asm/sections.h> #include <asm/prom.h> Index: linux-2.6.13-rc2-mm1/arch/ppc64/kernel/pSeries_setup.c =================================================================== --- linux-2.6.13-rc2-mm1.orig/arch/ppc64/kernel/pSeries_setup.c +++ linux-2.6.13-rc2-mm1/arch/ppc64/kernel/pSeries_setup.c @@ -37,7 +37,7 @@ #include <linux/ioport.h> #include <linux/console.h> #include <linux/pci.h> -#include <linux/version.h> +#include <linux/utsname.h> #include <linux/adb.h> #include <linux/module.h> #include <linux/delay.h> @@ -253,7 +253,7 @@ static int __init pSeries_init_panel(voi { /* Manually leave the kernel version on the panel. */ ppc_md.progress("Linux ppc64n", 0); - ppc_md.progress(UTS_RELEASE, 0); + ppc_md.progress(system_utsname.version, 0); return 0; } Index: linux-2.6.13-rc2-mm1/arch/ppc64/kernel/prom.c =================================================================== --- linux-2.6.13-rc2-mm1.orig/arch/ppc64/kernel/prom.c +++ linux-2.6.13-rc2-mm1/arch/ppc64/kernel/prom.c @@ -22,7 +22,6 @@ #include <linux/kernel.h> #include <linux/string.h> #include <linux/init.h> -#include <linux/version.h> #include <linux/threads.h> #include <linux/spinlock.h> #include <linux/types.h> Index: linux-2.6.13-rc2-mm1/arch/ppc64/kernel/prom_init.c =================================================================== --- linux-2.6.13-rc2-mm1.orig/arch/ppc64/kernel/prom_init.c +++ linux-2.6.13-rc2-mm1/arch/ppc64/kernel/prom_init.c @@ -22,7 +22,6 @@ #include <linux/kernel.h> #include <linux/string.h> #include <linux/init.h> -#include <linux/version.h> #include <linux/threads.h> #include <linux/spinlock.h> #include <linux/types.h> Index: linux-2.6.13-rc2-mm1/arch/ppc64/kernel/setup.c =================================================================== --- linux-2.6.13-rc2-mm1.orig/arch/ppc64/kernel/setup.c +++ linux-2.6.13-rc2-mm1/arch/ppc64/kernel/setup.c @@ -25,7 +25,7 @@ #include <linux/seq_file.h> #include <linux/ioport.h> #include <linux/console.h> -#include <linux/version.h> +#include <linux/utsname.h> #include <linux/tty.h> #include <linux/root_dev.h> #include <linux/notifier.h> @@ -653,7 +653,7 @@ void __init setup_system(void) smp_release_cpus(); #endif /* defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES) */ - printk("Starting Linux PPC64 %sn", UTS_RELEASE); + printk("Starting Linux PPC64 %sn", system_utsname.version); printk("-----------------------------------------------------n"); printk("ppc64_pft_size = 0x%lxn", ppc64_pft_size); Index: linux-2.6.13-rc2-mm1/arch/ppc64/kernel/vio.c =================================================================== --- linux-2.6.13-rc2-mm1.orig/arch/ppc64/kernel/vio.c +++ linux-2.6.13-rc2-mm1/arch/ppc64/kernel/vio.c @@ -14,7 +14,6 @@ #include <linux/init.h> #include <linux/console.h> -#include <linux/version.h> #include <linux/module.h> #include <linux/kobject.h> #include <linux/mm.h> - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/