diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /arch/s390/mm/pageattr.c | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'arch/s390/mm/pageattr.c')
| -rw-r--r-- | arch/s390/mm/pageattr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c index 7104ffb5a67f..af7cf28cf97e 100644 --- a/arch/s390/mm/pageattr.c +++ b/arch/s390/mm/pageattr.c | |||
| @@ -252,6 +252,8 @@ static int change_page_attr(unsigned long addr, unsigned long end, | |||
| 252 | int rc = -EINVAL; | 252 | int rc = -EINVAL; |
| 253 | pgd_t *pgdp; | 253 | pgd_t *pgdp; |
| 254 | 254 | ||
| 255 | if (addr == end) | ||
| 256 | return 0; | ||
| 255 | if (end >= MODULES_END) | 257 | if (end >= MODULES_END) |
| 256 | return -EINVAL; | 258 | return -EINVAL; |
| 257 | mutex_lock(&cpa_mutex); | 259 | mutex_lock(&cpa_mutex); |