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

Commit 2a0fede9 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:
 "Misc cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, cpu, amd: Fix a shadowed variable situation
  um, x86: Fix vDSO build
  x86: Delete non-required instances of include <linux/init.h>
  x86, realmode: Pointer walk cleanups, pull out invariant use of __pa()
  x86/traps: Clean up error exception handler definitions
parents 06bc0f4a d1393367

arch/x86/include/asm/mce.h

+0 −1
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ extern void mce_register_decode_chain(struct notifier_block *nb); 
extern void mce_unregister_decode_chain(struct notifier_block *nb);



#include <linux/percpu.h>

#include <linux/init.h>

#include <linux/atomic.h>



extern int mce_p5_enabled;

arch/x86/include/asm/mpspec.h

+0 −1
Original line number Diff line number Diff line 
#ifndef _ASM_X86_MPSPEC_H

#define _ASM_X86_MPSPEC_H



#include <linux/init.h>



#include <asm/mpspec_def.h>

#include <asm/x86_init.h>

arch/x86/include/asm/processor.h

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ struct mm_struct; 
#include <linux/cache.h>

#include <linux/threads.h>

#include <linux/math64.h>

#include <linux/init.h>

#include <linux/err.h>

#include <linux/irqflags.h>

arch/x86/include/asm/ptrace.h

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ struct pt_regs { 


#endif /* !__i386__ */



#include <linux/init.h>

#ifdef CONFIG_PARAVIRT

#include <asm/paravirt_types.h>

#endif

arch/x86/include/asm/smp.h

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#define _ASM_X86_SMP_H

#ifndef __ASSEMBLY__

#include <linux/cpumask.h>

#include <linux/init.h>

#include <asm/percpu.h>



/*