summaryrefslogtreecommitdiff
path: root/arch/x86/lib/bios.h
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-12-03 08:36:57 (GMT)
committerSimon Glass <sjg@chromium.org>2014-12-15 14:22:53 (GMT)
commite6126a58720ed8e53de93883c3f1572ad3d7b7c3 (patch)
treee57c32b0d9f8f0a738458f84c0ddb22a682cf67c /arch/x86/lib/bios.h
parentba7b38a5295d9bad1a95f53f0a3ade20441a3831 (diff)
downloadu-boot-fsl-qoriq-e6126a58720ed8e53de93883c3f1572ad3d7b7c3.tar.xz
x86: move arch-specific asmlinkage to <asm/linkage.h>
Commit 65dd74a674d6 (x86: ivybridge: Implement SDRAM init) introduced x86-specific asmlinkage into arch/x86/include/asm/config.h. Commit ed0a2fbf14f7 (x86: Add a definition of asmlinkage) added the same macro define again, this time, into include/common.h. (Please do not add arch-specific stuff to include/common.h any more; it is already too cluttered.) The generic asmlinkage is defined in <linux/linkage.h>. If you want to override it with an arch-specific one, the best way is to add it to <asm/linkage.h> like Linux Kernel. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86/lib/bios.h')
-rw-r--r--arch/x86/lib/bios.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/lib/bios.h b/arch/x86/lib/bios.h
index 8491b4a..668f4b5 100644
--- a/arch/x86/lib/bios.h
+++ b/arch/x86/lib/bios.h
@@ -10,6 +10,8 @@
#ifndef _X86_LIB_BIOS_H
#define _X86_LIB_BIOS_H
+#include <linux/linkage.h>
+
#define REALMODE_BASE 0x600
#ifdef __ASSEMBLY__