Skip to content

L
linux
Commit faa3b867 authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge nuts.ninka.net:/disk1/davem/BK/sparcwork-2.6 

into nuts.ninka.net:/disk1/davem/BK/sparc-2.6
parents be907e49 8e992923
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/asm-sparc64/pgtable.h
View file @ faa3b867
...@@ -145,9 +145,9 @@ ...@@ -145,9 +145,9 @@
#if defined(CONFIG_HUGETLB_PAGE_SIZE_4MB) #if defined(CONFIG_HUGETLB_PAGE_SIZE_4MB)
#define _PAGE_SZHUGE _PAGE_SZ4MB #define _PAGE_SZHUGE _PAGE_SZ4MB
#elif defined(CONFIG_HUGETLB_PAGE_SIZE_512K) #elif defined(CONFIG_HUGETLB_PAGE_SIZE_512K)
#define _PAGE_SZHUGE _PAGE_512K #define _PAGE_SZHUGE _PAGE_SZ512K
#elif defined(CONFIG_HUGETLB_PAGE_SIZE_64K) #elif defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
#define _PAGE_SZHUGE _PAGE_64K #define _PAGE_SZHUGE _PAGE_SZ64K
#endif #endif
#define _PAGE_CACHE (_PAGE_CP | _PAGE_CV) #define _PAGE_CACHE (_PAGE_CP | _PAGE_CV)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7