Skip to content

Commit 66441bd

Browse files
author
Ingo Molnar
committed
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 <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Dan Williams <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Huang, Ying <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Juergen Gross <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Paul Jackson <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Rafael J. Wysocki <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Wei Yang <[email protected]> Cc: Yinghai Lu <[email protected]> Cc: [email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 7b80ba5 commit 66441bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+43
-43
lines changed

‎arch/x86/boot/header.S‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include <asm/segment.h>
1919
#include <generated/utsrelease.h>
2020
#include <asm/boot.h>
21-
#include <asm/e820.h>
21+
#include <asm/e820/api.h>
2222
#include <asm/page_types.h>
2323
#include <asm/setup.h>
2424
#include <asm/bootparam.h>

‎arch/x86/include/asm/e820.h‎ renamed to ‎arch/x86/include/asm/e820/api.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef _ASM_X86_E820_H
2-
#define _ASM_X86_E820_H
1+
#ifndef _ASM_E820_API_H
2+
#define _ASM_E820_API_H
33

44
/*
55
* 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)
7070
#include <linux/ioport.h>
7171

7272
#define HIGH_MEMORY (1024*1024)
73-
#endif /* _ASM_X86_E820_H */
73+
#endif /* _ASM_E820_API_H */

‎arch/x86/include/asm/gart.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _ASM_X86_GART_H
22
#define _ASM_X86_GART_H
33

4-
#include <asm/e820.h>
4+
#include <asm/e820/api.h>
55

66
extern void set_up_gart_resume(u32, u32);
77

‎arch/x86/include/asm/pgtable.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define _ASM_X86_PGTABLE_H
33

44
#include <asm/page.h>
5-
#include <asm/e820.h>
5+
#include <asm/e820/api.h>
66

77
#include <asm/pgtable_types.h>
88

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <linux/screen_info.h>
3535
#include <linux/apm_bios.h>
3636
#include <linux/edd.h>
37-
#include <asm/e820.h>
37+
#include <asm/e820/api.h>
3838
#include <asm/ist.h>
3939
#include <video/edid.h>
4040

‎arch/x86/kernel/aperture_64.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <linux/pci.h>
2222
#include <linux/bitops.h>
2323
#include <linux/suspend.h>
24-
#include <asm/e820.h>
24+
#include <asm/e820/api.h>
2525
#include <asm/io.h>
2626
#include <asm/iommu.h>
2727
#include <asm/gart.h>

‎arch/x86/kernel/apic/apic_noop.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
#include <linux/interrupt.h>
2828
#include <asm/acpi.h>
29-
#include <asm/e820.h>
29+
#include <asm/e820/api.h>
3030

3131
static void noop_init_apic_ldr(void) { }
3232
static void noop_send_IPI(int cpu, int vector) { }

‎arch/x86/kernel/apic/probe_32.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
#include <linux/interrupt.h>
2727
#include <asm/acpi.h>
28-
#include <asm/e820.h>
28+
#include <asm/e820/api.h>
2929

3030
#ifdef CONFIG_HOTPLUG_CPU
3131
#define DEFAULT_SEND_IPI (1)

‎arch/x86/kernel/cpu/centaur.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <linux/kernel.h>
33

44
#include <asm/cpufeature.h>
5-
#include <asm/e820.h>
5+
#include <asm/e820/api.h>
66
#include <asm/mtrr.h>
77
#include <asm/msr.h>
88

‎arch/x86/kernel/cpu/mtrr/cleanup.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include <linux/range.h>
2828

2929
#include <asm/processor.h>
30-
#include <asm/e820.h>
30+
#include <asm/e820/api.h>
3131
#include <asm/mtrr.h>
3232
#include <asm/msr.h>
3333

0 commit comments

Comments
 (0)