diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2006-10-17 03:24:14 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-10-17 22:28:49 -0400 |
commit | 7341df16a1f228be833e918cb42534a34381a37e (patch) | |
tree | d9605076113e9d9c2c0ff2428280197fdff291ae | |
parent | 9950421c1e90d08d52ef47df1fcebe6078b04af3 (diff) |
[SPARC]: Kill BOOTME_SINGLE.
Unused, but still allow the '-s' boot option to be passed
down to init.
Based upon patches by Martin Habets.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/kernel/setup.c | 2 | ||||
-rw-r--r-- | arch/sparc64/kernel/setup.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c index f5ee1ac834bc..383526ad94fc 100644 --- a/arch/sparc/kernel/setup.c +++ b/arch/sparc/kernel/setup.c | |||
@@ -103,7 +103,6 @@ void prom_sync_me(void) | |||
103 | 103 | ||
104 | unsigned int boot_flags __initdata = 0; | 104 | unsigned int boot_flags __initdata = 0; |
105 | #define BOOTME_DEBUG 0x1 | 105 | #define BOOTME_DEBUG 0x1 |
106 | #define BOOTME_SINGLE 0x2 | ||
107 | 106 | ||
108 | /* Exported for mm/init.c:paging_init. */ | 107 | /* Exported for mm/init.c:paging_init. */ |
109 | unsigned long cmdline_memory_size __initdata = 0; | 108 | unsigned long cmdline_memory_size __initdata = 0; |
@@ -132,7 +131,6 @@ static void __init process_switch(char c) | |||
132 | boot_flags |= BOOTME_DEBUG; | 131 | boot_flags |= BOOTME_DEBUG; |
133 | break; | 132 | break; |
134 | case 's': | 133 | case 's': |
135 | boot_flags |= BOOTME_SINGLE; | ||
136 | break; | 134 | break; |
137 | case 'h': | 135 | case 'h': |
138 | prom_printf("boot_flags_init: Halt!\n"); | 136 | prom_printf("boot_flags_init: Halt!\n"); |
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index cc8ad480a204..bf033b31d437 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c | |||
@@ -74,7 +74,6 @@ prom_console_write(struct console *con, const char *s, unsigned n) | |||
74 | 74 | ||
75 | unsigned int boot_flags = 0; | 75 | unsigned int boot_flags = 0; |
76 | #define BOOTME_DEBUG 0x1 | 76 | #define BOOTME_DEBUG 0x1 |
77 | #define BOOTME_SINGLE 0x2 | ||
78 | 77 | ||
79 | /* Exported for mm/init.c:paging_init. */ | 78 | /* Exported for mm/init.c:paging_init. */ |
80 | unsigned long cmdline_memory_size = 0; | 79 | unsigned long cmdline_memory_size = 0; |
@@ -102,7 +101,6 @@ static void __init process_switch(char c) | |||
102 | boot_flags |= BOOTME_DEBUG; | 101 | boot_flags |= BOOTME_DEBUG; |
103 | break; | 102 | break; |
104 | case 's': | 103 | case 's': |
105 | boot_flags |= BOOTME_SINGLE; | ||
106 | break; | 104 | break; |
107 | case 'h': | 105 | case 'h': |
108 | prom_printf("boot_flags_init: Halt!\n"); | 106 | prom_printf("boot_flags_init: Halt!\n"); |