Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c20dcc5 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, summit: consolidate code, fix 



Build fix for !NUMA Summit.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b11b867f

arch/x86/kernel/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o 
obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o

obj-$(CONFIG_X86_NUMAQ)		+= numaq_32.o

obj-$(CONFIG_X86_NUMAQ)		+= numaq_32.o

obj-$(CONFIG_X86_ES7000)	+= es7000_32.o

obj-$(CONFIG_X86_ES7000)	+= es7000_32.o

obj-$(CONFIG_X86_SUMMIT_NUMA)	+= summit_32.o

obj-$(CONFIG_X86_SUMMIT)	+= summit_32.o

obj-y				+= vsmp_64.o

obj-y				+= vsmp_64.o

obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_MODULES)		+= module_$(BITS).o

obj-$(CONFIG_MODULES)		+= module_$(BITS).o

arch/x86/kernel/summit_32.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -389,6 +389,7 @@ static void summit_vector_allocation_domain(int cpu, cpumask_t *retmask) 
	*retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } };

	*retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } };

}

}





#ifdef CONFIG_X86_SUMMIT_NUMA

static struct rio_table_hdr *rio_table_hdr __initdata;

static struct rio_table_hdr *rio_table_hdr __initdata;

static struct scal_detail   *scal_devs[MAX_NUMNODES] __initdata;

static struct scal_detail   *scal_devs[MAX_NUMNODES] __initdata;

static struct rio_detail    *rio_devs[MAX_NUMNODES*4] __initdata;

static struct rio_detail    *rio_devs[MAX_NUMNODES*4] __initdata;
@@ -543,7 +544,7 @@ void __init setup_summit(void) 
			next_wpeg = 0;

			next_wpeg = 0;

	} while (next_wpeg != 0);

	} while (next_wpeg != 0);

}

}



#endif





struct genapic apic_summit = {

struct genapic apic_summit = {