diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-27 17:23:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-27 17:23:31 -0400 |
| commit | 68aaf4459556b1f9370c259fd486aecad2257552 (patch) | |
| tree | 99d92536a3263634969be6b70a96facea85a0df1 /kernel/module.c | |
| parent | d00ee466a07eb9182ad3caf6140c7ebb527b4c64 (diff) | |
| parent | 9e8312f5e160ade069e131d54ab8652cf0e86e1a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/module.c')
| -rw-r--r-- | kernel/module.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c index 5933395af9a0..9ee93421269c 100644 --- a/kernel/module.c +++ b/kernel/module.c | |||
| @@ -65,9 +65,9 @@ | |||
| 65 | /* | 65 | /* |
| 66 | * Modules' sections will be aligned on page boundaries | 66 | * Modules' sections will be aligned on page boundaries |
| 67 | * to ensure complete separation of code and data, but | 67 | * to ensure complete separation of code and data, but |
| 68 | * only when CONFIG_STRICT_MODULE_RWX=y | 68 | * only when CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y |
| 69 | */ | 69 | */ |
| 70 | #ifdef CONFIG_STRICT_MODULE_RWX | 70 | #ifdef CONFIG_ARCH_HAS_STRICT_MODULE_RWX |
| 71 | # define debug_align(X) ALIGN(X, PAGE_SIZE) | 71 | # define debug_align(X) ALIGN(X, PAGE_SIZE) |
| 72 | #else | 72 | #else |
| 73 | # define debug_align(X) (X) | 73 | # define debug_align(X) (X) |