From 49d34312f5efadb33b1599a332d2509a624ac8cf Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sat, 25 Apr 2009 22:10:56 -0400 Subject: [PATCH] --- yaml --- r: 144158 b: refs/heads/master c: c80d471a476b6d6fe0bc1fd25293c24c66b7aaaf h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-generic/vmlinux.lds.h | 4 +++- trunk/include/linux/init.h | 4 +++- trunk/include/linux/section-names.h | 6 ++++++ 4 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 trunk/include/linux/section-names.h diff --git a/[refs] b/[refs] index dee6cb8c77af..373fe290116d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c8454f56623505a99463405fd7d5664adfbb094 +refs/heads/master: c80d471a476b6d6fe0bc1fd25293c24c66b7aaaf diff --git a/trunk/include/asm-generic/vmlinux.lds.h b/trunk/include/asm-generic/vmlinux.lds.h index 7fa660fd449c..eaa06ef6f7d9 100644 --- a/trunk/include/asm-generic/vmlinux.lds.h +++ b/trunk/include/asm-generic/vmlinux.lds.h @@ -1,3 +1,5 @@ +#include + #ifndef LOAD_OFFSET #define LOAD_OFFSET 0 #endif @@ -331,7 +333,7 @@ #endif /* Section used for early init (in .S files) */ -#define HEAD_TEXT *(.head.text) +#define HEAD_TEXT *(HEAD_TEXT_SECTION) /* init and exit section handling */ #define INIT_DATA \ diff --git a/trunk/include/linux/init.h b/trunk/include/linux/init.h index f121a7a10c3d..20a1334e34e9 100644 --- a/trunk/include/linux/init.h +++ b/trunk/include/linux/init.h @@ -2,6 +2,8 @@ #define _LINUX_INIT_H #include +#include +#include /* These macros are used to mark some functions or * initialized data (doesn't apply to uninitialized data) @@ -107,7 +109,7 @@ #define __memexitconst __section(.memexit.rodata) /* For assembly routines */ -#define __HEAD .section ".head.text","ax" +#define __HEAD .section __stringify(HEAD_TEXT_SECTION),"ax" #define __INIT .section ".init.text","ax" #define __FINIT .previous diff --git a/trunk/include/linux/section-names.h b/trunk/include/linux/section-names.h new file mode 100644 index 000000000000..c956f4eb2adf --- /dev/null +++ b/trunk/include/linux/section-names.h @@ -0,0 +1,6 @@ +#ifndef __LINUX_SECTION_NAMES_H +#define __LINUX_SECTION_NAMES_H + +#define HEAD_TEXT_SECTION .head.text + +#endif /* !__LINUX_SECTION_NAMES_H */