[PATCH] x86/asm/entry: Drop now unused ENABLE_INTERRUPTS_SYSEXIT32

2015-04-03 Thread Borislav Petkov
From: Borislav Petkov b...@suse.de

Commit

  4214a16b0297 (x86/asm/entry/64/compat: Use SYSRETL to return from compat 
mode SYSENTER)

removed the last user of ENABLE_INTERRUPTS_SYSEXIT32. Kill the macro now
too.

Signed-off-by: Borislav Petkov b...@suse.de
Cc: Andy Lutomirski l...@amacapital.net
Cc: Brian Gerst brge...@gmail.com
Cc: Denys Vlasenko dvlas...@redhat.com
Cc: H. Peter Anvin h...@zytor.com
Cc: Linus Torvalds torva...@linux-foundation.org
Cc: Thomas Gleixner t...@linutronix.de
Cc: Ingo Molnar mi...@kernel.org
Cc: virtualization@lists.linux-foundation.org
---
 arch/x86/include/asm/irqflags.h | 4 
 arch/x86/include/asm/paravirt.h | 5 -
 2 files changed, 9 deletions(-)

diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
index 9a63eae04e4b..b77f5edb03b0 100644
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -136,10 +136,6 @@ static inline notrace unsigned long 
arch_local_irq_save(void)
 #define USERGS_SYSRET32\
swapgs; \
sysretl
-#define ENABLE_INTERRUPTS_SYSEXIT32\
-   swapgs; \
-   sti;\
-   sysexit
 
 #else
 #define INTERRUPT_RETURN   iret
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index 965c47d254aa..5f6051d5d139 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -976,11 +976,6 @@ extern void default_banner(void);
PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_usergs_sysret64),   \
  CLBR_NONE,\
  jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_usergs_sysret64))
-
-#define ENABLE_INTERRUPTS_SYSEXIT32\
-   PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit),\
- CLBR_NONE,\
- jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
 #endif /* CONFIG_X86_32 */
 
 #endif /* __ASSEMBLY__ */
-- 
2.3.3

___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization


[PATCH net-next] netdevice: document NETDEV_TX_BUSY deprecation.

2015-04-03 Thread Rusty Russell
This paraphrases DaveM (and steals some of his words) explaining why
a device shouldn't return NETDEV_TX_BUSY, even though it looks so inviting
to driver authors.

See http://www.spinics.net/lists/netdev/msg322350.html

Inspired-by: David Miller da...@davemloft.net
Signed-off-by: Rusty Russell ru...@rustcorp.com.au

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index dcf6ec27739b..a2cad44b8630 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -795,7 +795,10 @@ typedef u16 (*select_queue_fallback_t)(struct net_device 
*dev,
  * netdev_tx_t (*ndo_start_xmit)(struct sk_buff *skb,
  *   struct net_device *dev);
  * Called when a packet needs to be transmitted.
- * Must return NETDEV_TX_OK , NETDEV_TX_BUSY.
+ * Returns NETDEV_TX_OK.  Can return NETDEV_TX_BUSY, but you should stop
+ * the queue before that can happen; it's for obsolete devices and weird
+ * corner cases, but the stack really does a non-trivial amount
+ * of useless work if you return NETDEV_TX_BUSY.
  *(can also return NETDEV_TX_LOCKED iff NETIF_F_LLTX)
  * Required can not be NULL.
  *
___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization


Re: [PATCH net-next] netdevice: document NETDEV_TX_BUSY deprecation.

2015-04-03 Thread David Miller
From: Rusty Russell ru...@rustcorp.com.au
Date: Fri, 03 Apr 2015 22:17:17 +1030

 This paraphrases DaveM (and steals some of his words) explaining why
 a device shouldn't return NETDEV_TX_BUSY, even though it looks so inviting
 to driver authors.
 
 See http://www.spinics.net/lists/netdev/msg322350.html
 
 Inspired-by: David Miller da...@davemloft.net
 Signed-off-by: Rusty Russell ru...@rustcorp.com.au

Applied.
___
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization