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

Commit a8adc0f0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 cleanups from Ingo Molnar:
 "Header file and a wrapper functions cleanup"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Migrate exception table users off module.h and onto extable.h
  x86: Clean up various simple wrapper functions
parents 3ef0a61a 744c193e

arch/x86/kernel/apic/apic_flat_64.c

+3 −13
Original line number Diff line number Diff line
@@ -116,27 +116,17 @@ static void flat_send_IPI_all(int vector) 


static unsigned int flat_get_apic_id(unsigned long x)

{

	unsigned int id;



	id = (((x)>>24) & 0xFFu);



	return id;

	return (x >> 24) & 0xFF;

}



static unsigned long set_apic_id(unsigned int id)

{

	unsigned long x;



	x = ((id & 0xFFu)<<24);

	return x;

	return (id & 0xFF) << 24;

}



static unsigned int read_xapic_id(void)

{

	unsigned int id;



	id = flat_get_apic_id(apic_read(APIC_ID));

	return id;

	return flat_get_apic_id(apic_read(APIC_ID));

}



static int flat_apic_id_registered(void)

arch/x86/kernel/apic/apic_numachip.c

+1 −4
Original line number Diff line number Diff line
@@ -40,10 +40,7 @@ static unsigned int numachip1_get_apic_id(unsigned long x) 


static unsigned long numachip1_set_apic_id(unsigned int id)

{

	unsigned long x;



	x = ((id & 0xffU) << 24);

	return x;

	return (id & 0xff) << 24;

}



static unsigned int numachip2_get_apic_id(unsigned long x)

arch/x86/kernel/apic/x2apic_uv_x.c

+2 −5
Original line number Diff line number Diff line
@@ -533,11 +533,8 @@ static unsigned int x2apic_get_apic_id(unsigned long x) 


static unsigned long set_apic_id(unsigned int id)

{

	unsigned long x;



	/* maskout x2apic_extra_bits ? */

	x = id;

	return x;

	/* CHECKME: Do we need to mask out the xapic extra bits? */

	return id;

}



static unsigned int uv_read_apic_id(void)

arch/x86/kernel/kprobes/core.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
#include <linux/slab.h>

#include <linux/hardirq.h>

#include <linux/preempt.h>

#include <linux/module.h>

#include <linux/extable.h>

#include <linux/kdebug.h>

#include <linux/kallsyms.h>

#include <linux/ftrace.h>

arch/x86/kernel/kprobes/opt.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/slab.h>

#include <linux/hardirq.h>

#include <linux/preempt.h>

#include <linux/module.h>

#include <linux/extable.h>

#include <linux/kdebug.h>

#include <linux/kallsyms.h>

#include <linux/ftrace.h>