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

Commit 47dabdc7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/cleanups', 'x86/fpu' and 'x86/urgent' into x86/core

parents 923a789b 46814dde

arch/x86/kernel/head64.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <asm/trampoline.h>



/* boot cpu pda */

static struct x8664_pda _boot_cpu_pda __read_mostly;

static struct x8664_pda _boot_cpu_pda;



#ifdef CONFIG_SMP

/*

arch/x86/kernel/tlb_uv.c

+0 −9
Original line number Diff line number Diff line
@@ -582,7 +582,6 @@ static int __init uv_ptc_init(void) 
static struct bau_control * __init uv_table_bases_init(int blade, int node)

{

	int i;

	int *ip;

	struct bau_msg_status *msp;

	struct bau_control *bau_tabp;
@@ -599,13 +598,6 @@ static struct bau_control * __init uv_table_bases_init(int blade, int node) 
		bau_cpubits_clear(&msp->seen_by, (int)

				  uv_blade_nr_possible_cpus(blade));



	bau_tabp->watching =

	    kmalloc_node(sizeof(int) * DEST_NUM_RESOURCES, GFP_KERNEL, node);

	BUG_ON(!bau_tabp->watching);



	for (i = 0, ip = bau_tabp->watching; i < DEST_Q_SIZE; i++, ip++)

		*ip = 0;



	uv_bau_table_bases[blade] = bau_tabp;



	return bau_tabp;
@@ -628,7 +620,6 @@ uv_table_bases_finish(int blade, int node, int cur_cpu, 
		bcp->bau_msg_head	= bau_tablesp->va_queue_first;

		bcp->va_queue_first	= bau_tablesp->va_queue_first;

		bcp->va_queue_last	= bau_tablesp->va_queue_last;

		bcp->watching		= bau_tablesp->watching;

		bcp->msg_statuses	= bau_tablesp->msg_statuses;

		bcp->descriptor_base	= adp;

	}