diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 19:38:04 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 19:38:04 +0200 |
commit | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (patch) | |
tree | 8492ea548fea2d8243e4af4b877906afc4e32783 /arch | |
parent | b4093d6235b7e4249616651ee328600ced48a18a (diff) | |
parent | 658874f05d040ca96eb5ba9b1c30ce0ff287d762 (diff) | |
download | op-kernel-dev-2e6713c7662cc5ebc7346b033c404cb2f708fd51.zip op-kernel-dev-2e6713c7662cc5ebc7346b033c404cb2f708fd51.tar.gz |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/mm/highmem_32.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c index 58f621e..2112ed5 100644 --- a/arch/x86/mm/highmem_32.c +++ b/arch/x86/mm/highmem_32.c @@ -103,6 +103,7 @@ EXPORT_SYMBOL(kmap); EXPORT_SYMBOL(kunmap); EXPORT_SYMBOL(kmap_atomic); EXPORT_SYMBOL(kunmap_atomic); +EXPORT_SYMBOL(kmap_atomic_prot); void __init set_highmem_pages_init(void) { |