From 90fcf383636f452ab027656e4fb7e95c79aa878c Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Sun, 2 Oct 2011 09:12:37 +0200 Subject: microblaze: Remove NET_IP_ALIGN from system.h Use default value (which is the same) from include/linux/skbuff.h. Signed-off-by: Michal Simek --- arch/microblaze/include/asm/system.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'arch/microblaze/include/asm/system.h') diff --git a/arch/microblaze/include/asm/system.h b/arch/microblaze/include/asm/system.h index e6a2284..0953d14 100644 --- a/arch/microblaze/include/asm/system.h +++ b/arch/microblaze/include/asm/system.h @@ -96,11 +96,4 @@ extern struct dentry *of_debugfs_root; #define arch_align_stack(x) (x) -/* - * MicroBlaze doesn't handle unaligned accesses in hardware. - * - * Based on this we force the IP header alignment in network drivers. - */ -#define NET_IP_ALIGN 2 - #endif /* _ASM_MICROBLAZE_SYSTEM_H */ -- cgit v1.1 From 84ac218f0257a0cfd7689d9a44f53118dbf307b3 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 24 Aug 2011 15:32:31 +0200 Subject: microblaze: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW usage As far as I can tell the only reason microblaze has __ARCH_WANT_INTERRUPTS_ON_CTXSW is because it initializes new task state with interrupts enabled so that on switch_to() interrupts get enabled. So change copy_thread() to clear MSR_IE instead of set it, this will ensure switch_to() will always keep IRQs disabled. The scheduler will disable IRQs when taking rq->lock in schedule() and enable IRQs in finish_lock_switch() after its done its magic. This leaves ARM the only __ARCH_WANT_INTERRUPTS_ON_CTXSW user. Signed-off-by: Peter Zijlstra Signed-off-by: Michal Simek --- arch/microblaze/include/asm/system.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'arch/microblaze/include/asm/system.h') diff --git a/arch/microblaze/include/asm/system.h b/arch/microblaze/include/asm/system.h index 0953d14..5a433cb 100644 --- a/arch/microblaze/include/asm/system.h +++ b/arch/microblaze/include/asm/system.h @@ -17,8 +17,6 @@ #include #include -#define __ARCH_WANT_INTERRUPTS_ON_CTXSW - struct task_struct; struct thread_info; -- cgit v1.1