Skip to content

Commit cebb2b1

Browse files
olafheringpaulusmack
authored andcommitted
[PATCH] remove linux/version.h include from arch/ppc64
Changing CONFIG_LOCALVERSION rebuilds too much, for no apparent reason. Use system_utsname for progress and debug header. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
1 parent 14b3466 commit cebb2b1

File tree

5 files changed

+4
-7
lines changed

5 files changed

+4
-7
lines changed

arch/ppc64/kernel/btext.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <linux/kernel.h>
88
#include <linux/string.h>
99
#include <linux/init.h>
10-
#include <linux/version.h>
1110

1211
#include <asm/sections.h>
1312
#include <asm/prom.h>

arch/ppc64/kernel/pSeries_setup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include <linux/ioport.h>
3838
#include <linux/console.h>
3939
#include <linux/pci.h>
40-
#include <linux/version.h>
40+
#include <linux/utsname.h>
4141
#include <linux/adb.h>
4242
#include <linux/module.h>
4343
#include <linux/delay.h>
@@ -272,7 +272,7 @@ static int __init pSeries_init_panel(void)
272272
{
273273
/* Manually leave the kernel version on the panel. */
274274
ppc_md.progress("Linux ppc64\n", 0);
275-
ppc_md.progress(UTS_RELEASE, 0);
275+
ppc_md.progress(system_utsname.version, 0);
276276

277277
return 0;
278278
}

arch/ppc64/kernel/prom.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <linux/kernel.h>
2323
#include <linux/string.h>
2424
#include <linux/init.h>
25-
#include <linux/version.h>
2625
#include <linux/threads.h>
2726
#include <linux/spinlock.h>
2827
#include <linux/types.h>

arch/ppc64/kernel/prom_init.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <linux/kernel.h>
2323
#include <linux/string.h>
2424
#include <linux/init.h>
25-
#include <linux/version.h>
2625
#include <linux/threads.h>
2726
#include <linux/spinlock.h>
2827
#include <linux/types.h>

arch/ppc64/kernel/setup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <linux/seq_file.h>
2626
#include <linux/ioport.h>
2727
#include <linux/console.h>
28-
#include <linux/version.h>
28+
#include <linux/utsname.h>
2929
#include <linux/tty.h>
3030
#include <linux/root_dev.h>
3131
#include <linux/notifier.h>
@@ -621,7 +621,7 @@ void __init setup_system(void)
621621
smp_release_cpus();
622622
#endif /* defined(CONFIG_SMP) && !defined(CONFIG_PPC_ISERIES) */
623623

624-
printk("Starting Linux PPC64 %s\n", UTS_RELEASE);
624+
printk("Starting Linux PPC64 %s\n", system_utsname.version);
625625

626626
printk("-----------------------------------------------------\n");
627627
printk("ppc64_pft_size = 0x%lx\n", ppc64_pft_size);

0 commit comments

Comments
 (0)