summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* inet_diag: Rename inet_diag_req into inet_diag_req_v2Pavel Emelyanov2012-01-115-34/+34
| | | | | Signed-off-by: Pavel Emelyanov <xemul@parallels.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* bond_alb: don't disable softirq under bond_alb_xmitMaxim Uvarov2012-01-111-36/+76
| | | | | | | | | | | | | | | | | | No need to lock soft irqs under bond_alb_xmit() which already has softirq disabled. Changes: 1. add non-bh/bh version to tlb_clear_slave() 2. represent BH and non BH hash table locks _lock_rx_hashtbl_bh/_unlock_rx_hashtbl_bh _lock_rx_hashtbl/_unlock_rx_hashtbl _lock_tx_hashtbl_bh/_unlock_tx_hashtbl_bh _lock_tx_hashtbl/_unlock_tx_hashtbl Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com> Signed-off-by: Cong Wang <amwang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* mdio-octeon: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+2
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* mdio-gpio: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+1
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* phy/fixed: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+1
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* bcm63xx_enet: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+1
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* ixp4xx-eth: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+1
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* davinci_emac: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+2
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* cpmac: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+1
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* stmmac: use an unique MDIO bus name.Florian Fainelli2012-01-112-2/+3
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* smsc911x: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+2
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* s6gmac: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+1
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* sh-eth: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+2
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* pxa168-eth: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+2
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* mv643xx-eth: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+2
| | | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Acked-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* lantiq_etop: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+4
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* fec: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+2
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* dnet: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+2
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* macb: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+2
| | | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* sb1250: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+2
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* au1000-eth: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+2
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* bfin_mac: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+2
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* ax88796: use an unique MDIO bus name.Florian Fainelli2012-01-111-1/+2
| | | | | Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* asix: fix setting custom MAC address on Asix 88178 devicesJussi Kivilinna2012-01-101-0/+7
| | | | | | | | | | | | | | | In kernel v3.2 initialization sequence for Asix 88178 devices was changed so that hardware is reseted on every time interface is brought up (ifconfig up), instead just at USB probe time. This causes problem with setting custom MAC address to device as ax88178_reset causes reload of MAC address from EEPROM. This patch fixes the issue by rewriting MAC address at end of ax88178_reset. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Acked-by: Grant Grundler <grundler@chromium.org> Cc: Allan Chou <allan@asix.com.tw> Cc: stable <stable@vger.kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* asix: fix setting custom MAC address on Asix 88772 devicesJussi Kivilinna2012-01-101-0/+8
| | | | | | | | | | | | | | | In kernel v3.2 initialization sequence for Asix 88772 devices was changed so that hardware is reseted on every time interface is brought up (ifconfig up), instead just at USB probe time. This causes problem with setting custom MAC address to device as ax88772_reset causes reload of MAC address from EEPROM. This patch fixes the issue by rewriting MAC address at end of ax88772_reset. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Acked-by: Grant Grundler <grundler@chromium.org> Cc: Allan Chou <allan@asix.com.tw> Cc: stable <stable@vger.kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
* drivers: isdn: Fix dependency for ISDN_PPPFabio Estevam2012-01-101-1/+1
| | | | | | | | | Fix the following build warning: warning: (ISDN_PPP) selects SLHC which has unmet direct dependencies (NETDEVICES) Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* stmmac: Add missing LF to pr_info() in stmmac_main.cStefan Roese2012-01-101-1/+1
| | | | | | | | | | | | | | | | | | | Otherwise the output looks like this: ... STMMAC - user ID: 0x10, Synopsys ID: 0x32 No HW DMA feature register supported Normal descriptors Remote wake-up capable Checksum Offload Engine supported No MAC Management Counters availableIP-Config: Complete: device=eth0, addr=192.168.20.42, mask=255.255.0.0, gw=192.168.1.254, ... Signed-off-by: Stefan Roese <sr@denx.de> Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com> Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* stmmac: Fix compilation error in mmc_core.cStefan Roese2012-01-101-0/+1
| | | | | | | | | | | | | | Fix this error: CC drivers/net/ethernet/stmicro/stmmac/mmc_core.o drivers/net/ethernet/stmicro/stmmac/mmc_core.c: In function 'dwmac_mmc_ctrl': drivers/net/ethernet/stmicro/stmmac/mmc_core.c:143:2: error: implicit declaration of function 'pr_debug' [-Werror=implicit-function-declaration] Signed-off-by: Stefan Roese <sr@denx.de> Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com> Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com> Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge branch 'davem-next.via-rhine' of git://violet.fr.zoreil.com/romieu/linuxDavid S. Miller2012-01-101-300/+368
|\
| * via-rhine: rework suspend and resume.Francois Romieu2012-01-071-21/+20
| | | | | | | | | | | | Cover of 861ab44059350e5cab350238606cf8814abab93b. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * via-rhine: per device debug level.Francois Romieu2012-01-071-90/+79
| | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * via-rhine: RHINE_WAIT_FOR macro removal.Francois Romieu2012-01-071-24/+50
| | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * via-rhine: move work from irq handler to softirq and beyond.Francois Romieu2012-01-071-177/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tx processing is moved from the irq handler to NAPI poll - link events and obscure event processing is moved to its proper work queue Locking rules undergo some changes through the driver. - the driver offers the usual lock-free Tx path - besides the IRQ handler, the link event task schedules the napi handler. The driver thus adds some internal locking to prevent a loop when both must be disabled. - the reset task keeps being scheduled from the Tx watchdog handler, thus with implicit Tx queue disabling. It does not need to care about irq, only napi softirq and competing task. - it is not worth to add a dedicated lock between {g, s}et_wol and rhine_shutdown. It should not hurt no narrow it down a bit though. - rhine_reset_task must keep its huge spin_lock_bh protected section due to : - races for the CAM registers (see rhine_vlan_rx_{add, kill}_vid) - implicit use of napi_enable (see init_registers) - use of the same lock for stats read / update exclusion between napi rx processing and rhine_get_stats - rhine_resume requires a softirq disabled section for the same reason as rhine_reset_task - {free, request}_irq have been replaced with IntrEnable actions in rhine_{suspend, resume}. It is hidden behind init_registers for the latter. Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * via-rhine: remove useless forward declarations.Francois Romieu2012-01-071-7/+0
| | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * via-rhine: balance interrupt acknowledge and events retrieval.Francois Romieu2012-01-071-8/+14
| | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
| * via-rhine: factor out tx_thresh handlingFrancois Romieu2012-01-071-5/+12
| | | | | | | | Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
* | Merge branch 'for-linus' of ↵Linus Torvalds2012-01-105-53/+63
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: vfs: new helper - d_make_root() dcache: use a dispose list in select_parent ceph: d_alloc_root() may fail ext4: fix failure exits isofs: inode leak on mount failure
| * | vfs: new helper - d_make_root()Al Viro2012-01-102-0/+18
| | | | | | | | | | | | | | | | | | d_alloc_root() with iput() in case of allocation failure... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| * | dcache: use a dispose list in select_parentDave Chinner2012-01-101-42/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | select_parent currently abuses the dentry cache LRU to provide cleanup features for child dentries that need to be freed. It moves them to the tail of the LRU, then tells shrink_dcache_parent() to calls __shrink_dcache_sb to unconditionally move them to a dispose list (as DCACHE_REFERENCED is ignored). __shrink_dcache_sb() has to relock the dentries to move them off the LRU onto the dispose list, but otherwise does not touch the dentries that select_parent() moved to the tail of the LRU. It then passses the dispose list to shrink_dentry_list() which tries to free the dentries. IOWs, the use of __shrink_dcache_sb() is superfluous - we can build exactly the same list of dentries for disposal directly in select_parent() and call shrink_dentry_list() instead of calling __shrink_dcache_sb() to do that. This means that we avoid long holds on the lru lock walking the LRU moving dentries to the dispose list We also avoid the need to relock each dentry just to move it off the LRU, reducing the numebr of times we lock each dentry to dispose of them in shrink_dcache_parent() from 3 to 2 times. Further, we remove one of the two callers of __shrink_dcache_sb(). This also means that __shrink_dcache_sb can be moved into back into prune_dcache_sb() and we no longer have to handle referenced dentries conditionally, simplifying the code. Signed-off-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| * | ceph: d_alloc_root() may failAl Viro2012-01-091-4/+11
| | | | | | | | | | | | | | | | | | ... and ceph_init_dentry(NULL) will oops Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| * | ext4: fix failure exitsAl Viro2012-01-091-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | a) leaking root dentry is bad b) in case of failed ext4_mb_init() we don't want to do ext4_mb_release() c) OTOH, in the same case we *do* want ext4_ext_release() Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| * | isofs: inode leak on mount failureAl Viro2012-01-091-2/+5
| | | | | | | | | | | | | | | | | | d_alloc_root() failure leaves root inode leaked... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-nextLinus Torvalds2012-01-098-347/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next: sparc32: remove unused file: include/asm/pgtsun4.h sparc32: fix PAGE_SIZE definition sparc32: enable different preemptions models sparc32: support atomic64_t apbuart: fix section mismatch warning sparc32: drop useless preprocessor conditional in atomic_32.h sparc32: drop unused atomic24 support
| * | | sparc32: remove unused file: include/asm/pgtsun4.hSam Ravnborg2011-12-301-171/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sun4 is no longer supported and this file is unused. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc32: fix PAGE_SIZE definitionSam Ravnborg2011-12-292-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use _AC() in definition of PAGE_SIZE so the same definition can be used in C and assembler. Also use PAGE_SIZE in definition of THREAD_SIZE. This commit kill the following comment: "I have my suspicions... -DaveM" I did not find any clue what this referred to anyway. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc32: enable different preemptions modelsSam Ravnborg2011-12-291-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While chasing following warning from kconfig I noticed that the kconfig preemption model symbols were all dependent on sparc64. warning: (PREEMPT && DEBUG_ATOMIC_SLEEP) selects PREEMPT_COUNT which has unmet direct dependencies (SPARC64) >From arch/sparc/Kconfig: if SPARC64 source "kernel/Kconfig.preempt" endif But looking a bit closer I see nothing obvious why sparc32 should not support the various preemption models. Drop the "if SPARC64" conditional to enable selection of preemption model on sparc32 too. Build-tested - but not run-time tested all three models. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc32: support atomic64_tSam Ravnborg2011-12-272-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no-one that really require atomic64_t support on sparc32. But several drivers fails to build without proper atomic64 support. And for an allyesconfig build for sparc32 this is annoying. Include the generic atomic64_t support for sparc32. This has a text footprint cost: $size vmlinux (before atomic64_t support) text data bss dec hex filename 3578860 134260 108781 3821901 3a514d vmlinux $size vmlinux (after atomic64_t support) text data bss dec hex filename 3579892 130684 108781 3819357 3a475d vmlinux text increase (3579892 - 3578860) = 1032 bytes data decreases - but I fail to explain why! I have rebuild twice to check my numbers. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | apbuart: fix section mismatch warningSam Ravnborg2011-12-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix following warnings: WARNING: drivers/tty/serial/built-in.o(.text+0x7370): Section mismatch in reference from the function grlib_apbuart_configure() to the variable .init.data:apbuart_match The function grlib_apbuart_configure() references the variable __initdata apbuart_match. This is often because grlib_apbuart_configure lacks a __initdata annotation or the annotation of apbuart_match is wrong. + 3 more warnings like this. There is no guarantee that grlib_apbuart_of_driver.of_match_table is only used at __init time - so drop the __initdata annotation. grlib_apbuart_configure() is only used during __init so add __init to this method too. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Daniel Hellstrom <daniel@gaisler.com> Cc: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc32: drop useless preprocessor conditional in atomic_32.hSam Ravnborg2011-12-271-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arch/sparc/include/asm/atomic_32.h is not exported to userspace. So there is no need to protect code using __KERNEL__. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | sparc32: drop unused atomic24 supportSam Ravnborg2011-12-273-161/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | atomic24 support was used to semaphores in the past - but is no longer used. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: David S. Miller <davem@davemloft.net>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 00:59:57 +0100