2 files changed, 2 insertions, 2 deletions

diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c
index 5b20a5e7ac28..a23e8233b9ac 100644
--- a/arch/x86/kernel/numaq_32.c
+++ b/arch/x86/kernel/numaq_32.c
@@ -96,7 +96,7 @@ int __init get_memcfg_numaq(void)
 void __init numaq_tsc_disable(void)
 {
         if (!found_numaq)
-                return -1;
+                return;
 
         if (num_online_nodes() > 1) {
                 printk(KERN_DEBUG "NUMAQ: disabling TSC\n");
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 27de2435e008..306049edd553 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -644,7 +644,7 @@ static unsigned long __init kernel_physical_mapping_init(unsigned long start,
                 unsigned long pud_phys;
                 pud_t *pud;
 
-                next = start + PGDIR_SIZE;
+                next = (start + PGDIR_SIZE) & PGDIR_MASK;
                 if (next > end)
                         next = end;