x86: change cachemode symbols to non-gpl to avoid breaking out-of-tree modules
PATCH 1/1 x86: change cachemode symbols to non-gpl to avoid breaking out-of-tree modules
Commit 281d4078bec366d60990add9d91a952953bd0d72 ("x86: Make page cache mode a real type") introduced the symbols __cachemode2pte_tbl and __pte2cachemode_tbl and exported them via EXPORT_SYMBOL_GPL. This will break building out-of-tree non-gpl modules which need to set caching mode in ptes.
Change EXPORT_SYMBOL_GPL to EXPORT-SYMBOL for these two symbols.
--- arch/x86/mm/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/init.c +2 -2
@@ -43,7 +43,7 @@ uint16_t __cachemode2pte_tbl[_PAGE_CACHE_MODE_NUM] = { [_PAGE_CACHE_MODE_WT] = _PAGE_PCD, [_PAGE_CACHE_MODE_WP] = _PAGE_PCD, }; -EXPORT_SYMBOL_GPL (__cachemode2pte_tbl ); +EXPORT_SYMBOL (__cachemode2pte_tbl );uint8_t __pte2cachemode_tbl[8 ] = { [__pte2cm_idx (0 )] = _PAGE_CACHE_MODE_WB, [__pte2cm_idx (_PAGE_PWT)] = _PAGE_CACHE_MODE_WC,
@@ -54,7 +54,7 @@ uint8_t __pte2cachemode_tbl[8] = { [__pte2cm_idx(_PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC_MINUS, [__pte2cm_idx (_PAGE_PWT | _PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC, }; -EXPORT_SYMBOL_GPL (__pte2cachemode_tbl); +EXPORT_SYMBOL (__pte2cachemode_tbl);static unsigned long __initdata pgt_buf_start;static unsigned long __initdata pgt_buf_end;
Signature · 1 line
2.1.2
Quoted 9 lines · Juergen Gross
Commit
281d4078bec366d60990add9d91a952953bd0d72("x86: Make page cache mode a real type") introduced the symbols__cachemode2pte_tbland__pte2cachemode_tbland exported them viaEXPORT_SYMBOL_GPL. This will break building out-of-tree non-gpl modules which need to set caching mode in ptes.Change
EXPORT_SYMBOL_GPLto EXPORT-SYMBOL for these two symbols.Reported-by Stevan Noonan <[email protected]>
Steven, not "Stevan". :)
Otherwise, patch looks good. Already tested an identical change locally and it unbroke the out-of-tree module builds.
Quoted 30 lines
Signed-off-by Juergen Gross <[email protected]>--- arch/x86/mm/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/mm/init.c +2
-3@@ -43,7 +43,7 @@ uint16_t __cachemode2pte_tbl[_PAGE_CACHE_MODE_NUM] = { [_PAGE_CACHE_MODE_WT] = _PAGE_PCD, [_PAGE_CACHE_MODE_WP] = _PAGE_PCD, }; -EXPORT_SYMBOL_GPL (__cachemode2pte_tbl ); +EXPORT_SYMBOL (__cachemode2pte_tbl );uint8_t __pte2cachemode_tbl[8 ] = { [__pte2cm_idx (0 )] = _PAGE_CACHE_MODE_WB, [__pte2cm_idx (_PAGE_PWT)] = _PAGE_CACHE_MODE_WC,@@ -54,7 +54,7 @@ uint8_t __pte2cachemode_tbl[8] = { [__pte2cm_idx(_PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC_MINUS, [__pte2cm_idx (_PAGE_PWT | _PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC, }; -EXPORT_SYMBOL_GPL (__pte2cachemode_tbl); +EXPORT_SYMBOL (__pte2cachemode_tbl);static unsigned long __initdata pgt_buf_start;static unsigned long __initdata pgt_buf_end; --2.1.2
Quoted 10 lines · Juergen Gross
Commit
281d4078bec366d60990add9d91a952953bd0d72("x86: Make page cache mode a real type") introduced the symbols__cachemode2pte_tbland__pte2cachemode_tbland exported them viaEXPORT_SYMBOL_GPL. This will break building out-of-tree non-gpl modules which need to set caching mode in ptes.Change
EXPORT_SYMBOL_GPLto EXPORT-SYMBOL for these two symbols.Reported-by Stevan Noonan <[email protected]>Signed-off-by Juergen Gross <[email protected]>
-Toshi
Quoted 26 lines
--- arch/x86/mm/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)arch/x86/mm/init.c +2
-2@@ -43,7 +43,7 @@ uint16_t __cachemode2pte_tbl[_PAGE_CACHE_MODE_NUM] = { [_PAGE_CACHE_MODE_WT] = _PAGE_PCD, [_PAGE_CACHE_MODE_WP] = _PAGE_PCD, }; -EXPORT_SYMBOL_GPL (__cachemode2pte_tbl ); +EXPORT_SYMBOL (__cachemode2pte_tbl );uint8_t __pte2cachemode_tbl[8 ] = { [__pte2cm_idx (0 )] = _PAGE_CACHE_MODE_WB, [__pte2cm_idx (_PAGE_PWT)] = _PAGE_CACHE_MODE_WC,@@ -54,7 +54,7 @@ uint8_t __pte2cachemode_tbl[8] = { [__pte2cm_idx(_PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC_MINUS, [__pte2cm_idx (_PAGE_PWT | _PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC, }; -EXPORT_SYMBOL_GPL (__pte2cachemode_tbl); +EXPORT_SYMBOL (__pte2cachemode_tbl);static unsigned long __initdata pgt_buf_start;static unsigned long __initdata pgt_buf_end;
tip-bot for Juergen Gross
merge bot[tip:x86/urgent] x86, mm: Change cachemode exports to non-gpl
In reply to Juergen Grossx86, mm: Change cachemode exports to non-gpl
Commit-ID: 31bb7723706ba9660504a6c3903ea46198f98fd1 Gitweb: http://git.kernel.org/tip/31bb7723706ba9660504a6c3903ea46198f98fd1 Author: Juergen Gross <[email protected]> AuthorDate: Thu, 22 Jan 2015 12:43:17 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Thu, 22 Jan 2015 21:50:14 +0100
x86, mm: Change cachemode exports to non-gpl
Commit 281d4078bec3 ("x86: Make page cache mode a real type") introduced the symbols __cachemode2pte_tbl and __pte2cachemode_tbl and exported them via EXPORT_SYMBOL_GPL. The exports are part of a replacement of code which has been EXPORT_SYMBOL before these changes resulting in build breakage of out-of-tree non-gpl modules.
Change EXPORT_SYMBOL_GPL to EXPORT-SYMBOL for these two symbols.
--- arch/x86/mm/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/init.c +2 -2
@@ -43,7 +43,7 @@ uint16_t __cachemode2pte_tbl[_PAGE_CACHE_MODE_NUM] = { [_PAGE_CACHE_MODE_WT] = _PAGE_PCD, [_PAGE_CACHE_MODE_WP] = _PAGE_PCD, }; -EXPORT_SYMBOL_GPL (__cachemode2pte_tbl ); +EXPORT_SYMBOL (__cachemode2pte_tbl );uint8_t __pte2cachemode_tbl[8 ] = { [__pte2cm_idx (0 )] = _PAGE_CACHE_MODE_WB, [__pte2cm_idx (_PAGE_PWT)] = _PAGE_CACHE_MODE_WC,
@@ -54,7 +54,7 @@ uint8_t __pte2cachemode_tbl[8] = { [__pte2cm_idx(_PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC_MINUS, [__pte2cm_idx (_PAGE_PWT | _PAGE_PCD | _PAGE_PAT)] = _PAGE_CACHE_MODE_UC, }; -EXPORT_SYMBOL_GPL (__pte2cachemode_tbl); +EXPORT_SYMBOL (__pte2cachemode_tbl);static unsigned long __initdata pgt_buf_start;static unsigned long __initdata pgt_buf_end;