Commit 66441bd3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/boot/e820: Move asm/e820.h to asm/e820/api.h 



In line with asm/e820/types.h, move the e820 API declarations to
asm/e820/api.h and update all usage sites.

This is just a mechanical, obviously correct move & replace patch,
there will be subsequent changes to clean up the code and to make
better use of the new header organization.

Cc: Alex Thorlton <athorlton@sgi.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang, Ying <ying.huang@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Jackson <pj@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 7b80ba55

arch/x86/boot/header.S

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

#include <generated/utsrelease.h>

#include <asm/boot.h>

#include <asm/e820.h>

#include <asm/e820/api.h>

#include <asm/page_types.h>

#include <asm/setup.h>

#include <asm/bootparam.h>

arch/x86/include/asm/e820.h→arch/x86/include/asm/e820/api.h

+3 −3
Original line number Diff line number Diff line 
#ifndef _ASM_X86_E820_H

#define _ASM_X86_E820_H

#ifndef _ASM_E820_API_H

#define _ASM_E820_API_H



/*

 * E820_X_MAX is the maximum size of the extended E820 table.  The extended
@@ -70,4 +70,4 @@ static inline bool is_ISA_range(u64 s, u64 e) 
#include <linux/ioport.h>



#define HIGH_MEMORY	(1024*1024)

#endif /* _ASM_X86_E820_H */
 
#endif /* _ASM_E820_API_H */

arch/x86/include/asm/gart.h

+1 −1
Original line number Diff line number Diff line 
#ifndef _ASM_X86_GART_H

#define _ASM_X86_GART_H



#include <asm/e820.h>

#include <asm/e820/api.h>



extern void set_up_gart_resume(u32, u32);

arch/x86/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
#define _ASM_X86_PGTABLE_H



#include <asm/page.h>

#include <asm/e820.h>

#include <asm/e820/api.h>



#include <asm/pgtable_types.h>

arch/x86/include/uapi/asm/bootparam.h

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

#include <linux/apm_bios.h>

#include <linux/edd.h>

#include <asm/e820.h>

#include <asm/e820/api.h>

#include <asm/ist.h>

#include <video/edid.h>