forked from Minki/linux
[PATCH] powerpc: cleanup pmac_newworld variable usage
remove extern declarations of pmac_newworld move pmac_newworld to bss if there is any "interrupt-controller" device, then it is newworld. Signed-off-by: Olaf Hering <olh@suse.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
42dc75c4b9
commit
d2515c806e
@ -57,7 +57,6 @@ extern void machine_check_exception(struct pt_regs *regs);
|
||||
extern void alignment_exception(struct pt_regs *regs);
|
||||
extern void program_check_exception(struct pt_regs *regs);
|
||||
extern void single_step_exception(struct pt_regs *regs);
|
||||
extern int pmac_newworld;
|
||||
extern int sys_sigreturn(struct pt_regs *regs);
|
||||
|
||||
EXPORT_SYMBOL(clear_pages);
|
||||
|
@ -88,11 +88,10 @@ int ppc_override_l2cr = 0;
|
||||
int ppc_override_l2cr_value;
|
||||
int has_l2cache = 0;
|
||||
|
||||
int pmac_newworld = 1;
|
||||
int pmac_newworld;
|
||||
|
||||
static int current_root_goodness = -1;
|
||||
|
||||
extern int pmac_newworld;
|
||||
extern struct machdep_calls pmac_md;
|
||||
|
||||
#define DEFAULT_ROOT_DEVICE Root_SDA1 /* sda1 - slightly silly choice */
|
||||
@ -310,9 +309,10 @@ static void __init pmac_setup_arch(void)
|
||||
for (ic = NULL; (ic = of_find_all_nodes(ic)) != NULL; )
|
||||
if (get_property(ic, "interrupt-controller", NULL))
|
||||
break;
|
||||
pmac_newworld = (ic != NULL);
|
||||
if (ic)
|
||||
if (ic) {
|
||||
pmac_newworld = 1;
|
||||
of_node_put(ic);
|
||||
}
|
||||
|
||||
/* Lookup PCI hosts */
|
||||
pmac_pci_init();
|
||||
|
Loading…
Reference in New Issue
Block a user