diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 14:56:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-19 14:56:13 -0700 |
| commit | 98a38a5d60a6e79eaad7f4a9b68cc1bd306ac5c0 (patch) | |
| tree | bc6e761e7ead6b877c28abe908eaf9745c4f8627 /arch | |
| parent | 7663164f2619e37a1dcad59383e2fcf8c5194107 (diff) | |
| parent | f721a465cddbe7f03e6cd2272008da558cf93818 (diff) | |
| download | linux-3.10-98a38a5d60a6e79eaad7f4a9b68cc1bd306ac5c0.tar.gz linux-3.10-98a38a5d60a6e79eaad7f4a9b68cc1bd306ac5c0.tar.bz2 linux-3.10-98a38a5d60a6e79eaad7f4a9b68cc1bd306ac5c0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
params.c: Use new strtobool function to process boolean inputs
debugfs: move to new strtobool
Add a strtobool function matching semantics of existing in kernel equivalents
modpost: Update 64k section support for binutils 2.18.50
module: Use binary search in lookup_symbol()
module: Use the binary search for symbols resolution
lib: Add generic binary search function to the kernel.
module: Sort exported symbols
module: each_symbol_section instead of each_symbol
module: split unset_section_ro_nx function.
module: undo module RONX protection correctly.
module: zero mod->init_ro_size after init is freed.
minor ANSI prototype sparse fix
module: reorder kparam_array to remove alignment padding on 64 bit builds
module: remove 64 bit alignment padding from struct module with CONFIG_TRACE*
module: do not hide __modver_version_show declaration behind ifdef
module: deal with alignment issues in built-in module versions
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/include/asm/cacheflush.h | 1 | ||||
| -rw-r--r-- | arch/s390/mm/pageattr.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/s390/include/asm/cacheflush.h b/arch/s390/include/asm/cacheflush.h index 43a5c78046d..3e20383d092 100644 --- a/arch/s390/include/asm/cacheflush.h +++ b/arch/s390/include/asm/cacheflush.h @@ -11,5 +11,6 @@ void kernel_map_pages(struct page *page, int numpages, int enable); int set_memory_ro(unsigned long addr, int numpages); int set_memory_rw(unsigned long addr, int numpages); int set_memory_nx(unsigned long addr, int numpages); +int set_memory_x(unsigned long addr, int numpages); #endif /* _S390_CACHEFLUSH_H */ diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c index 0607e4b14b2..f05edcc3bef 100644 --- a/arch/s390/mm/pageattr.c +++ b/arch/s390/mm/pageattr.c @@ -54,3 +54,8 @@ int set_memory_nx(unsigned long addr, int numpages) return 0; } EXPORT_SYMBOL_GPL(set_memory_nx); + +int set_memory_x(unsigned long addr, int numpages) +{ + return 0; +} |