git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull sony into release branch
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
setup.c
diff --git
a/arch/sparc/kernel/setup.c
b/arch/sparc/kernel/setup.c
index
0251cab
..
eccd8e8
100644
(file)
--- a/
arch/sparc/kernel/setup.c
+++ b/
arch/sparc/kernel/setup.c
@@
-103,7
+103,6
@@
void prom_sync_me(void)
unsigned int boot_flags __initdata = 0;
#define BOOTME_DEBUG 0x1
unsigned int boot_flags __initdata = 0;
#define BOOTME_DEBUG 0x1
-#define BOOTME_SINGLE 0x2
/* Exported for mm/init.c:paging_init. */
unsigned long cmdline_memory_size __initdata = 0;
/* Exported for mm/init.c:paging_init. */
unsigned long cmdline_memory_size __initdata = 0;
@@
-121,16
+120,6
@@
static struct console prom_debug_console = {
.index = -1,
};
.index = -1,
};
-int obp_system_intr(void)
-{
- if (boot_flags & BOOTME_DEBUG) {
- printk("OBP: system interrupted\n");
- prom_halt();
- return 1;
- }
- return 0;
-}
-
/*
* Process kernel command line switches that are specific to the
* SPARC or that require special low-level processing.
/*
* Process kernel command line switches that are specific to the
* SPARC or that require special low-level processing.
@@
-142,7
+131,6
@@
static void __init process_switch(char c)
boot_flags |= BOOTME_DEBUG;
break;
case 's':
boot_flags |= BOOTME_DEBUG;
break;
case 's':
- boot_flags |= BOOTME_SINGLE;
break;
case 'h':
prom_printf("boot_flags_init: Halt!\n");
break;
case 'h':
prom_printf("boot_flags_init: Halt!\n");
@@
-258,7
+246,7
@@
void __init setup_arch(char **cmdline_p)
/* Initialize PROM console and command line. */
*cmdline_p = prom_getbootargs();
/* Initialize PROM console and command line. */
*cmdline_p = prom_getbootargs();
- strcpy(
saved
_command_line, *cmdline_p);
+ strcpy(
boot
_command_line, *cmdline_p);
/* Set sparc_cpu_model */
sparc_cpu_model = sun_unknown;
/* Set sparc_cpu_model */
sparc_cpu_model = sun_unknown;