Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
* 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
kbuild: Revert part of e8d400a
to resolve a conflict
kbuild: Fix checking of scm-identifier variable
gconfig: add support to show hidden options that have prompts
menuconfig: add support to show hidden options which have prompts
gconfig: remove show_debug option
gconfig: remove dbg_print_ptype() and dbg_print_stype()
kconfig: fix zconfdump()
kconfig: some small fixes
add random binaries to .gitignore
kbuild: Include gen_initramfs_list.sh and the file list in the .d file
kconfig: recalc symbol value before showing search results
.gitignore: ignore *.lzo files
headerdep: perlcritic warning
scripts/Makefile.lib: Align the output of LZO
kbuild: Generate modules.builtin in make modules_install
Revert "kbuild: specify absolute paths for cscope"
kbuild: Do not unnecessarily regenerate modules.builtin
headers_install: use local file handles
headers_check: fix perl warnings
export_report: fix perl warnings
...
This commit is contained in:
@@ -31,7 +31,7 @@
|
||||
#ifndef __cacheline_aligned
|
||||
#define __cacheline_aligned \
|
||||
__attribute__((__aligned__(SMP_CACHE_BYTES), \
|
||||
__section__(".data.cacheline_aligned")))
|
||||
__section__(".data..cacheline_aligned")))
|
||||
#endif /* __cacheline_aligned */
|
||||
|
||||
#ifndef __cacheline_aligned_in_smp
|
||||
|
@@ -301,7 +301,7 @@ void __init parse_early_options(char *cmdline);
|
||||
#endif
|
||||
|
||||
/* Data marked not to be saved by software suspend */
|
||||
#define __nosavedata __section(.data.nosave)
|
||||
#define __nosavedata __section(.data..nosave)
|
||||
|
||||
/* This means "can be init if no module support, otherwise module load
|
||||
may call it." */
|
||||
|
@@ -183,7 +183,7 @@ extern struct cred init_cred;
|
||||
}
|
||||
|
||||
/* Attach to the init_task data structure for proper alignment */
|
||||
#define __init_task_data __attribute__((__section__(".data.init_task")))
|
||||
#define __init_task_data __attribute__((__section__(".data..init_task")))
|
||||
|
||||
|
||||
#endif
|
||||
|
@@ -18,8 +18,8 @@
|
||||
# define asmregparm
|
||||
#endif
|
||||
|
||||
#define __page_aligned_data __section(.data.page_aligned) __aligned(PAGE_SIZE)
|
||||
#define __page_aligned_bss __section(.bss.page_aligned) __aligned(PAGE_SIZE)
|
||||
#define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
|
||||
#define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
|
||||
|
||||
/*
|
||||
* For assembly routines.
|
||||
@@ -27,8 +27,8 @@
|
||||
* Note when using these that you must specify the appropriate
|
||||
* alignment directives yourself
|
||||
*/
|
||||
#define __PAGE_ALIGNED_DATA .section ".data.page_aligned", "aw"
|
||||
#define __PAGE_ALIGNED_BSS .section ".bss.page_aligned", "aw"
|
||||
#define __PAGE_ALIGNED_DATA .section ".data..page_aligned", "aw"
|
||||
#define __PAGE_ALIGNED_BSS .section ".bss..page_aligned", "aw"
|
||||
|
||||
/*
|
||||
* This is used by architectures to keep arguments on the stack
|
||||
|
@@ -131,11 +131,11 @@
|
||||
* Declaration/definition used for per-CPU variables that must be page aligned.
|
||||
*/
|
||||
#define DECLARE_PER_CPU_PAGE_ALIGNED(type, name) \
|
||||
DECLARE_PER_CPU_SECTION(type, name, ".page_aligned") \
|
||||
DECLARE_PER_CPU_SECTION(type, name, "..page_aligned") \
|
||||
__aligned(PAGE_SIZE)
|
||||
|
||||
#define DEFINE_PER_CPU_PAGE_ALIGNED(type, name) \
|
||||
DEFINE_PER_CPU_SECTION(type, name, ".page_aligned") \
|
||||
DEFINE_PER_CPU_SECTION(type, name, "..page_aligned") \
|
||||
__aligned(PAGE_SIZE)
|
||||
|
||||
/*
|
||||
|
@@ -60,7 +60,7 @@
|
||||
/*
|
||||
* Must define these before including other files, inline functions need them
|
||||
*/
|
||||
#define LOCK_SECTION_NAME ".text.lock."KBUILD_BASENAME
|
||||
#define LOCK_SECTION_NAME ".text..lock."KBUILD_BASENAME
|
||||
|
||||
#define LOCK_SECTION_START(extra) \
|
||||
".subsection 1\n\t" \
|
||||
|
Reference in New Issue
Block a user