From a47e27c221c2c6c3594872dc556ef3031fbcd47e Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Wed, 22 Aug 2007 13:51:36 +0200 Subject: [PATCH] --- yaml --- r: 64193 b: refs/heads/master c: 3520c92283bb7ddd59daf90cfc1eb107dc9ab76c h: refs/heads/master i: 64191: 487c2bdfdadb1192a190e890a5ecb46b74a5041d v: v3 --- [refs] | 2 +- trunk/arch/i386/mm/fault.c | 5 ++--- trunk/drivers/s390/cio/device.c | 5 ++++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 69104cd215f2..a63ca18e96fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b14cb9953c6b569327e9372718cff09a98f9589 +refs/heads/master: 3520c92283bb7ddd59daf90cfc1eb107dc9ab76c diff --git a/trunk/arch/i386/mm/fault.c b/trunk/arch/i386/mm/fault.c index fcb38e7f3543..01ffdd4964f0 100644 --- a/trunk/arch/i386/mm/fault.c +++ b/trunk/arch/i386/mm/fault.c @@ -249,10 +249,9 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address) pmd_k = pmd_offset(pud_k, address); if (!pmd_present(*pmd_k)) return NULL; - if (!pmd_present(*pmd)) { + if (!pmd_present(*pmd)) set_pmd(pmd, *pmd_k); - arch_flush_lazy_mmu_mode(); - } else + else BUG_ON(pmd_page(*pmd) != pmd_page(*pmd_k)); return pmd_k; } diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c index 297659fa0e26..e44d92eac8e9 100644 --- a/trunk/drivers/s390/cio/device.c +++ b/trunk/drivers/s390/cio/device.c @@ -117,7 +117,10 @@ static int ccw_uevent(struct device *dev, char **envp, int num_envp, snprint_alias(modalias_buf, sizeof(modalias_buf), id, ""); ret = add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &len, "MODALIAS=%s", modalias_buf); - return ret; + if (ret) + return ret; + envp[i] = NULL; + return 0; } struct bus_type ccw_bus_type;