diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-03-21 10:47:40 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-03-21 10:47:40 +0100 |
commit | 42e405f7b1d252c90a2468dd2140f47b8142b7a0 (patch) | |
tree | baeda52d8726fe694d3344a0d0fda1dadc30a901 /arch/x86/kernel/test_rodata.c | |
parent | e9532e69b8d1d1284e8ecf8d2586de34aec61244 (diff) | |
parent | 710d60cbf1b312a8075a2158cbfbbd9c66132dcc (diff) | |
download | lwn-42e405f7b1d252c90a2468dd2140f47b8142b7a0.tar.gz lwn-42e405f7b1d252c90a2468dd2140f47b8142b7a0.zip |
Merge branch 'linus' into sched/urgent, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/test_rodata.c')
-rw-r--r-- | arch/x86/kernel/test_rodata.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/test_rodata.c b/arch/x86/kernel/test_rodata.c index 5ecbfe5099da..cb4a01b41e27 100644 --- a/arch/x86/kernel/test_rodata.c +++ b/arch/x86/kernel/test_rodata.c @@ -76,5 +76,5 @@ int rodata_test(void) } MODULE_LICENSE("GPL"); -MODULE_DESCRIPTION("Testcase for the DEBUG_RODATA infrastructure"); +MODULE_DESCRIPTION("Testcase for marking rodata as read-only"); MODULE_AUTHOR("Arjan van de Ven <arjan@linux.intel.com>"); |