Merge branch 'cpus4096' into irq/threaded

Conflicts:
	arch/parisc/kernel/irq.c
	kernel/irq/handle.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 2 insertions, 2 deletions

diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index 743f5542d65..3a3dad80135 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -1375,10 +1375,10 @@ EXPORT_SYMBOL_GPL(snmp_fold_field);
 int snmp_mib_init(void *ptr[2], size_t mibsize)
 {
         BUG_ON(ptr == NULL);
-        ptr[0] = __alloc_percpu(mibsize);
+        ptr[0] = __alloc_percpu(mibsize, __alignof__(unsigned long long));
         if (!ptr[0])
                 goto err0;
-        ptr[1] = __alloc_percpu(mibsize);
+        ptr[1] = __alloc_percpu(mibsize, __alignof__(unsigned long long));
         if (!ptr[1])
                 goto err1;
         return 0;