i386/x86_64: move headers to include/asm-x86 (96a388de) · Commits · 戴 / test

Documentation/lguest/lguest.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ typedef uint32_t u32;
		typedef uint16_t u16;
		typedef uint8_t u8;
		#include "../../include/linux/lguest_launcher.h"
		#include "../../include/asm-i386/e820.h"
		#include "../../include/asm-x86/e820_32.h"
		/:/

		#define PAGE_PRESENT 0x7 /* Present, RW, Execute */

Kbuild

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@
		# 1) Generate asm-offsets.h
		#

		offsets-file := include/asm-$(ARCH)/asm-offsets.h
		offsets-file := include/asm-$(SRCARCH)/asm-offsets.h

		always := $(offsets-file)
		targets := $(offsets-file)

Makefile

+9 −8

Original line number	Diff line number	Diff line
		@@ -863,7 +863,7 @@ ifneq ($(KBUILD_SRC),)
		/bin/false; \
		fi;
		$(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
		$(Q)ln -fsn $(srctree)/include/asm-$(ARCH) include2/asm
		$(Q)ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm
		endif

		# prepare2 creates a makefile if using a separate output directory
		@@ -895,9 +895,9 @@ export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)
		# before switching between archs anyway.

		include/asm:
		@echo ' SYMLINK $@ -> include/asm-$(ARCH)'
		@echo ' SYMLINK $@ -> include/asm-$(SRCARCH)'
		$(Q)if [ ! -d include ]; then mkdir -p include; fi;
		@ln -fsn asm-$(ARCH) $@
		@ln -fsn asm-$(SRCARCH) $@

		# Generate some files
		# ---------------------------------------------------------------------------
		@@ -937,7 +937,8 @@ depend dep:
		INSTALL_HDR_PATH=$(objtree)/usr
		export INSTALL_HDR_PATH

		HDRARCHES=$(filter-out generic,$(patsubst $(srctree)/include/asm-%/Kbuild,%,$(wildcard $(srctree)/include/asm-*/Kbuild)))
		HDRFILTER=generic i386 x86_64
		HDRARCHES=$(filter-out $(HDRFILTER),$(patsubst $(srctree)/include/asm-%/Kbuild,%,$(wildcard $(srctree)/include/asm-*/Kbuild)))

		PHONY += headers_install_all
		headers_install_all: include/linux/version.h scripts_basic FORCE
		@@ -948,11 +949,11 @@ headers_install_all: include/linux/version.h scripts_basic FORCE

		PHONY += headers_install
		headers_install: include/linux/version.h scripts_basic FORCE
		@if [ ! -r $(srctree)/include/asm-$(ARCH)/Kbuild ]; then \
		echo '*** Error: Headers not exportable for this architecture ($(ARCH))'; \
		@if [ ! -r $(srctree)/include/asm-$(SRCARCH)/Kbuild ]; then \
		echo '*** Error: Headers not exportable for this architecture ($(SRCARCH))'; \
		exit 1 ; fi
		$(Q)$(MAKE) $(build)=scripts scripts/unifdef
		$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst obj=include
		$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst ARCH=$(SRCARCH) obj=include

		PHONY += headers_check_all
		headers_check_all: headers_install_all
		@@ -962,7 +963,7 @@ headers_check_all: headers_install_all

		PHONY += headers_check
		headers_check: headers_install
		$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst obj=include HDRCHECK=1
		$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst ARCH=$(SRCARCH) obj=include HDRCHECK=1

		# ---------------------------------------------------------------------------
		# Modules

arch/i386/Makefile

+8 −8

Original line number	Diff line number	Diff line
		@@ -71,32 +71,32 @@ CFLAGS += $(cflags-y)
		mcore-y := arch/x86/mach-default

		# Voyager subarch support
		mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-i386/mach-voyager
		mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-x86/mach-voyager
		mcore-$(CONFIG_X86_VOYAGER) := arch/x86/mach-voyager

		# VISWS subarch support
		mflags-$(CONFIG_X86_VISWS) := -Iinclude/asm-i386/mach-visws
		mflags-$(CONFIG_X86_VISWS) := -Iinclude/asm-x86/mach-visws
		mcore-$(CONFIG_X86_VISWS) := arch/x86/mach-visws

		# NUMAQ subarch support
		mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-i386/mach-numaq
		mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-x86/mach-numaq
		mcore-$(CONFIG_X86_NUMAQ) := arch/x86/mach-default

		# BIGSMP subarch support
		mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-i386/mach-bigsmp
		mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-x86/mach-bigsmp
		mcore-$(CONFIG_X86_BIGSMP) := arch/x86/mach-default

		#Summit subarch support
		mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit
		mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-x86/mach-summit
		mcore-$(CONFIG_X86_SUMMIT) := arch/x86/mach-default

		# generic subarchitecture
		mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic
		mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-x86/mach-generic
		mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default
		core-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/

		# ES7000 subarch support
		mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-i386/mach-es7000
		mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-x86/mach-es7000
		mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default
		core-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/

		@@ -104,7 +104,7 @@ core-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/
		core-$(CONFIG_XEN) += arch/x86/xen/

		# default subarch .h files
		mflags-y += -Iinclude/asm-i386/mach-default
		mflags-y += -Iinclude/asm-x86/mach-default

		head-y := arch/x86/kernel/head_32.o arch/x86/kernel/init_task_32.o

arch/ia64/ia32/audit.c

+1 −1

Original line number	Diff line number	Diff line
		#include <asm-i386/unistd.h>
		#include <asm-x86/unistd_32.h>

		unsigned ia32_dir_class[] = {
		#include <asm-generic/audit_dir_write.h>

Admin message