1. 11 8月, 2011 20 次提交
    • J
      enic: Move the Cisco driver · a6a5580c
      Jeff Kirsher 提交于
      Move the Cisco driver into drivers/net/ethernet/cisco/ and make the
      necessary Kconfig and Makefile changes.
      
      CC: Christian Benvenuti <benve@cisco.com>
      CC: Vasanthy Kolluri <vkolluri@cisco.com>
      CC: Roopa Prabhu <roprabhu@cisco.com>
      CC: David Wang <dwang2@cisco.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      a6a5580c
    • J
      ehea/ibm*: Move the IBM drivers · 9aa32835
      Jeff Kirsher 提交于
      Move the IBM drivers into drivers/net/ethernet/ibm/ and make the
      necessary Kconfig and Makefile changes.
      
      - Renamed ibm_new_emac to emac
      - Cleaned up Makefile and Kconfig options which referred to
        IBM_NEW_EMAC to IBM_EMAC
      - ibmlana driver is a National Semiconductor SONIC driver so
        it was not moved
      
      CC: Christoph Raisch <raisch@de.ibm.com>
      CC: Santiago Leon <santil@linux.vnet.ibm.com>
      CC: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      CC: David Gibson <dwg@au1.ibm.com>
      CC: Kyle Lucke <klucke@us.ibm.com>
      CC: Michael Ellerman <michael@ellerman.id.au>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      9aa32835
    • J
      s2io/vxge: Move the Exar drivers · 86387e1a
      Jeff Kirsher 提交于
      Move the Exar drivers into drivers/net/ethernet/neterion/ and make the
      necessary Kconfig and Makefile changes.
      
      CC: Jon Mason <jdmason@kudzu.us>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      86387e1a
    • J
      myri*: Move the Myricom drivers · 93f7848b
      Jeff Kirsher 提交于
      Move the Myricom drivers into drivers/net/ethernet/myricom/ and make
      the necessary Kconfig and Makefile changes.
      
      CC: Andrew Gallatin <gallatin@myri.com>
      CC: Brice Goglin <brice@myri.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      93f7848b
    • J
      mlx4: Move the Mellanox driver · 5a2cc190
      Jeff Kirsher 提交于
      Moves the Mellanox driver into drivers/net/ethernet/mellanox/ and
      make the necessary Kconfig and Makefile changes.
      
      CC: Roland Dreier <roland@kernel.org>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      5a2cc190
    • J
      bna: Move the Brocade driver · f844a0ea
      Jeff Kirsher 提交于
      Moves the Brocade driver into drivers/net/ethernet/brocade/ and make
      the necessary Kconfig and Makefile changes.
      
      CC: Rasesh Mody <rmody@brocade.com>
      CC: Debashis Dutt <ddutt@brocade.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      f844a0ea
    • J
      be2net: Move the Emulex driver · 9aebddd1
      Jeff Kirsher 提交于
      Moves the Emulex driver into drivers/net/ethernet/emulex/ and
      make the necessary Kconfig and Makefile changes.
      
      CC: Sathya Perla <sathya.perla@emulex.com>
      CC: Subbu Seetharaman <subbu.seetharaman@emulex.com>
      CC: Ajit Khaparde <ajit.khaparde@emulex.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      9aebddd1
    • J
      sfc: Move the Solarflare drivers · 874aeea5
      Jeff Kirsher 提交于
      Moves the Solarflare drivers into drivers/net/ethernet/sfc/ and
      make the necessary Kconfig and Makefile changes.
      
      CC: Steve Hodgson <shodgson@solarflare.com>
      CC: Ben Hutchings <bhutchings@solarflare.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      874aeea5
    • J
      cassini/niu/sun*: Move the Sun drivers · e689cf4a
      Jeff Kirsher 提交于
      Moves the Sun drivers into drivers/net/ethernet/sun/ and make
      the necessary Kconfig and Makefile changes.
      
      Oliver Hartkopp <socketcan@hartkopp.net> suggested removing the
      sun* prefix on the driver names.  This type of change I will
      leave up to the driver maintainers.
      
      CC: Sam Creasey <sammy@sammy.net>
      CC: Adrian Sun <asun@darksunrising.com>
      CC: Benjamin Herrenscmidt <benh@kernel.crashing.org>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      e689cf4a
    • J
      ni5010: Move the Racal-Interlan (Micom) driver · 8efc9125
      Jeff Kirsher 提交于
      Moves the Racal-Interlan driver into drivers/net/ethernet/racal/ and
      make the necessary Kconfig and Makefile changes.
      
      CC: "Jan-Pascal van Best" <janpascal@vanbest.org>
      CC: Andreas Mohr <andi@lisas.de>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      8efc9125
    • J
      i825xx: Move the Intel 82586/82593/82596 based drivers · 11597885
      Jeff Kirsher 提交于
      Move the drivers that use the i82586/i82593/i82596 chipsets into
      drivers/net/ethernet/i825xx/ and make the necessary Kconfig and
      Makefile changes.  There were 4 3Com drivers which were initially
      moved into 3com/, which now reside in i825xx since they all used
      the i82586 chip.
      
      CC: Philip Blundell <philb@gnu.org>
      CC: Russell King <linux@arm.linux.org.uk>
      CC: <aris@cathedrallabs.org>
      CC: Donald Becker <becker@scyld.com>
      CC: Chris Beauregard <cpbeaure@undergrad.math.uwaterloo.ca>
      CC: Richard Procter <rnp@paradise.net.nz>
      CC: Andries Brouwer <aeb@cwi.nl>
      CC: "M.Hipp" <hippm@informatik.uni-tuebingen.de>
      CC: Richard Hirst <richard@sleepie.demon.co.uk>
      CC: Sam Creasey <sammy@oh.verio.com>
      CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      11597885
    • J
      smsc: Move the SMC (SMSC) drivers · ae150435
      Jeff Kirsher 提交于
      Moves the SMC (SMSC) drivers into drivers/net/ethernet/smsc/ and the
      necessary Kconfig and Makefile changes.  Also did some cleanup
      of NET_VENDOR_SMC Kconfig tag for the 8390 based drivers.
      
      CC: Nicolas Pitre <nico@fluxnic.net>
      CC: Donald Becker <becker@scyld.com>
      CC: Erik Stahlman <erik@vt.edu>
      CC: Dustin McIntire <dustin@sensoria.com>
      CC: Steve Glendinning <steve.glendinning@smsc.com>
      CC: David Hinds <dahinds@users.sourceforge.net>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      ae150435
    • J
      qlogic: Move the QLogic drivers · aa43c215
      Jeff Kirsher 提交于
      Moves the QLogic drivers into drivers/net/ethernet/qlogic/ and
      the necessary Kconfig and Makefile changes.
      
      CC: Ron Mercer <ron.mercer@qlogic.com>
      CC: Amit Kumar Salecha <amit.salecha@qlogic.com>
      CC: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      Acked-by: NAnirban Chakraborty <anirban.chakraborty@qlogic.com>
      aa43c215
    • J
      intel: Move the Intel wired LAN drivers · dee1ad47
      Jeff Kirsher 提交于
      Moves the Intel wired LAN drivers into drivers/net/ethernet/intel/ and
      the necessary Kconfig and Makefile changes.
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      dee1ad47
    • J
      chelsio: Move the Chelsio drivers · f7917c00
      Jeff Kirsher 提交于
      Moves the drivers for the Chelsio chipsets into
      drivers/net/ethernet/chelsio/ and the necessary Kconfig and Makefile
      changes.
      
      CC: Divy Le Ray <divy@chelsio.com>
      CC: Dimitris Michailidis <dm@chelsio.com>
      CC: Casey Leedom <leedom@chelsio.com>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      f7917c00
    • J
      broadcom: Move the Broadcom drivers · adfc5217
      Jeff Kirsher 提交于
      Moves the drivers for Broadcom devices into
      drivers/net/ethernet/broadcom/ and the necessary Kconfig and Makefile
      changes.
      
      CC: Eilon Greenstein <eilong@broadcom.com>
      CC: Michael Chan <mchan@broadcom.com>
      CC: Matt Carlson <mcarlson@broadcom.com>
      CC: Gary Zambrano <zambrano@broadcom.com>
      CC: "Maciej W. Rozycki" <macro@linux-mips.org>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      adfc5217
    • J
      8390: Move the 8390 related drivers · 644570b8
      Jeff Kirsher 提交于
      Moves the drivers for the National Semi-conductor 8390 chipset into
      drivers/net/ethernet/8390/ and the necessary Kconfig and Makefile
      changes.
      
      CC: Donald Becker <becker@scyld.com>
      CC: Paul Gortmaker <paul.gortmaker@windriver.com>
      CC: Alain Malek <alain.malek@cryogen.com>
      CC: Peter De Schrijver <p2@mind.be>
      CC: "David Huggins-Daines" <dhd@debian.org>
      CC: Wim Dumon <wimpie@kotnet.org>
      CC: Yoshinori Sato <ysato@users.sourceforge.jp>
      CC: David Hinds <dahinds@users.sourceforge.net>
      CC: Russell King <linux@arm.linux.org.uk>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      644570b8
    • J
      amd: Move AMD (Lance) chipset drivers · b955f6ca
      Jeff Kirsher 提交于
      Moves the drivers for the AMD chipsets into drivers/net/ethernet/amd/
      and the necessary Kconfig and Makfile changes.
      
      The au1000 (Alchemy) driver was also moved into the same directory
      even though it is not a "Lance" driver.
      
      CC: Peter Maydell <pmaydell@chiark.greenend.org.uk>
      CC: Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
      CC: "Maciej W. Rozycki" <macro@linux-mips.org>
      CC: Donald Becker <becker@scyld.com>
      CC: Sam Creasey <sammy@users.qual.net>
      CC: Miguel de Icaza <miguel@nuclecu.unam.mx>
      CC: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
      CC: Don Fry <pcnet32@frontier.com>
      CC: Geert Uytterhoeven <geert@linux-m68k.org>
      CC: Russell King <linux@arm.linux.org.uk>
      CC: David Davies <davies@maniac.ultranet.com>
      CC: "M.Hipp" <hippm@informatik.uni-tuebingen.de>
      CC: Pete Popov <ppopov@embeddedalley.com>
      CC: David Hinds <dahinds@users.sourceforge.net>
      CC: "Roger C. Pao" <rpao@paonet.org>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      b955f6ca
    • J
      3c*/acenic/typhoon: Move 3Com Ethernet drivers · ca7a8e85
      Jeff Kirsher 提交于
      Moves the 3Com drivers into drivers/net/ethernet/3com/ and the necessary
      Kconfig and Makefile changes.
      
      Did not move the following drivers becuase they use a non-3Com
      chipset: 3c503, 3c505, 3c507, 3c523 and 3c527
      
      CC: Steffen Klassert <klassert@mathematik.tu-chemnitz.de>
      CC: David Dillow <dave@thedillows.org>
      CC: Jes Sorensen <jes@trained-monkey.org>
      CC: Alan Cox <alan@linux.intel.com>
      CC: David Hinds <dahinds@users.sourceforge.net>
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      Acked-by: NDavid Dillow <dave@thedillows.org>
      ca7a8e85
    • J
      drivers/net/ethernet: Add ethernet dir and config option · c1abc95b
      Jeff Kirsher 提交于
      This is the initial patch to organize the drivers/net directory
      structure and networking device driver config options.  This patch
      does the following:
        - add drivers/net/ethernet/Kconfig
        - integrate the new files into the existing config
      Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
      c1abc95b
  2. 08 8月, 2011 12 次提交
  3. 07 8月, 2011 2 次提交
  4. 06 8月, 2011 6 次提交
    • S
      Battery: sysfs_remove_battery(): possible circular locking · 69d94ec6
      Sergey Senozhatsky 提交于
      Commit 9c921c22
      Author: Lan Tianyu <tianyu.lan@intel.com>
      
          ACPI / Battery: Resolve the race condition in the sysfs_remove_battery()
      
      fixed BUG https://bugzilla.kernel.org/show_bug.cgi?id=35642 , but as a side
      effect made lockdep unhappy with sysfs_remove_battery():
      
      [14818.477168]
      [14818.477170] =======================================================
      [14818.477200] [ INFO: possible circular locking dependency detected ]
      [14818.477221] 3.1.0-dbg-07865-g1280ea8-dirty #668
      [14818.477236] -------------------------------------------------------
      [14818.477257] s2ram/1599 is trying to acquire lock:
      [14818.477276]  (s_active#8){++++.+}, at: [<ffffffff81169147>] sysfs_addrm_finish+0x31/0x5a
      [14818.477323]
      [14818.477325] but task is already holding lock:
      [14818.477350]  (&battery->lock){+.+.+.}, at: [<ffffffffa0047278>] sysfs_remove_battery+0x10/0x4b [battery]
      [14818.477395]
      [14818.477397] which lock already depends on the new lock.
      [14818.477399]
      [..]
      [14818.479121] stack backtrace:
      [14818.479148] Pid: 1599, comm: s2ram Not tainted 3.1.0-dbg-07865-g1280ea8-dirty #668
      [14818.479175] Call Trace:
      [14818.479198]  [<ffffffff814828c3>] print_circular_bug+0x293/0x2a4
      [14818.479228]  [<ffffffff81070cb5>] __lock_acquire+0xfe4/0x164b
      [14818.479260]  [<ffffffff81169147>] ? sysfs_addrm_finish+0x31/0x5a
      [14818.479288]  [<ffffffff810718d2>] lock_acquire+0x138/0x1ac
      [14818.479316]  [<ffffffff81169147>] ? sysfs_addrm_finish+0x31/0x5a
      [14818.479345]  [<ffffffff81168a79>] sysfs_deactivate+0x9b/0xec
      [14818.479373]  [<ffffffff81169147>] ? sysfs_addrm_finish+0x31/0x5a
      [14818.479405]  [<ffffffff81169147>] sysfs_addrm_finish+0x31/0x5a
      [14818.479433]  [<ffffffff81167bc5>] sysfs_hash_and_remove+0x54/0x77
      [14818.479461]  [<ffffffff811681b9>] sysfs_remove_file+0x12/0x14
      [14818.479488]  [<ffffffff81385bf8>] device_remove_file+0x12/0x14
      [14818.479516]  [<ffffffff81386504>] device_del+0x119/0x17c
      [14818.479542]  [<ffffffff81386575>] device_unregister+0xe/0x1a
      [14818.479570]  [<ffffffff813c6ef9>] power_supply_unregister+0x23/0x27
      [14818.479601]  [<ffffffffa004729c>] sysfs_remove_battery+0x34/0x4b [battery]
      [14818.479632]  [<ffffffffa004778f>] battery_notify+0x2c/0x3a [battery]
      [14818.479662]  [<ffffffff8148fe82>] notifier_call_chain+0x74/0xa1
      [14818.479692]  [<ffffffff810624b4>] __blocking_notifier_call_chain+0x6c/0x89
      [14818.479722]  [<ffffffff810624e0>] blocking_notifier_call_chain+0xf/0x11
      [14818.479751]  [<ffffffff8107e40e>] pm_notifier_call_chain+0x15/0x27
      [14818.479770]  [<ffffffff8107ee1a>] enter_state+0xa7/0xd5
      [14818.479782]  [<ffffffff8107e341>] state_store+0xaa/0xc0
      [14818.479795]  [<ffffffff8107e297>] ? pm_async_store+0x45/0x45
      [14818.479807]  [<ffffffff81248837>] kobj_attr_store+0x17/0x19
      [14818.479820]  [<ffffffff81167e27>] sysfs_write_file+0x103/0x13f
      [14818.479834]  [<ffffffff81109037>] vfs_write+0xad/0x13d
      [14818.479847]  [<ffffffff811092b2>] sys_write+0x45/0x6c
      [14818.479860]  [<ffffffff81492f92>] system_call_fastpath+0x16/0x1b
      
      This patch introduces separate lock to struct acpi_battery to
      grab in sysfs_remove_battery() instead of battery->lock.
      So fix by Lan Tianyu is still there, we just grab independent lock.
      Signed-off-by: NSergey Senozhatsky <sergey.senozhatsky@gmail.com>
      Tested-by: NLan Tianyu <tianyu.lan@intel.com>
      Signed-off-by: NLen Brown <len.brown@intel.com>
      69d94ec6
    • K
      PM / Runtime: Allow _put_sync() from interrupts-disabled context · 02b26774
      Kevin Hilman 提交于
      Currently the use of pm_runtime_put_sync() is not safe from
      interrupts-disabled context because rpm_idle() will release the
      spinlock and enable interrupts for the idle callbacks.  This enables
      interrupts during a time where interrupts were expected to be
      disabled, and can have strange side effects on drivers that expected
      interrupts to be disabled.
      
      This is not a bug since the documentation clearly states that only
      _put_sync_suspend() is safe in IRQ-safe mode.
      
      However, pm_runtime_put_sync() could be made safe when in IRQ-safe
      mode by releasing the spinlock but not re-enabling interrupts, which
      is what this patch aims to do.
      
      Problem was found when using some buggy drivers that set
      pm_runtime_irq_safe() and used _put_sync() in interrupts-disabled
      context.
      Reported-by: NColin Cross <ccross@google.com>
      Tested-by: NNishanth Menon <nm@ti.com>
      Signed-off-by: NKevin Hilman <khilman@ti.com>
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      02b26774
    • R
      PM / Domains: Fix pm_genpd_poweron() · fe202fde
      Rafael J. Wysocki 提交于
      The local variable ret is defined twice in pm_genpd_poweron(), which
      causes this function to always return 0, even if the PM domain's
      .power_on() callback fails, in which case an error code should be
      returned.
      
      Remove the wrong second definition of ret and additionally remove an
      unnecessary definition of wait from pm_genpd_poweron().
      Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      fe202fde
    • L
      acer-wmi: support Lenovo ideapad S205 wifi switch · 15b956a0
      Lee, Chun-Yi 提交于
      The AMW0 function in acer-wmi works on Lenovo ideapad S205 for control
      the wifi hardware state. We also found there have a 0x78 EC register
      exposes the state of wifi hardware switch on the machine.
      
      So, add this patch to support Lenovo ideapad S205 wifi hardware switch
      in acer-wmi driver.
      
      Reference: bko#37892
      	https://bugzilla.kernel.org/show_bug.cgi?id=37892
      
      Cc: Carlos Corbacho <carlos@strangeworlds.co.uk>
      Cc: Matthew Garrett <mjg@redhat.com>
      Cc: Dmitry Torokhov <dtor@mail.ru>
      Cc: Corentin Chary <corentincj@iksaif.net>
      Cc: Thomas Renninger <trenn@suse.de>
      Tested-by: NFlorian Heyer <heyho@flanto.de>
      Signed-off-by: NLee, Chun-Yi <jlee@suse.com>
      Signed-off-by: NMatthew Garrett <mjg@redhat.com>
      15b956a0
    • A
      acerhdf.c: spaces in aliased changed to * · 2c3422d9
      Anton V. Boyarshinov 提交于
      It seems that aliases shouldn't contain spaces, as
      module-init-tools uses them as delimeters in module.alias file
      Signed-off-by: NAnton V. Boyarshinov <boyarsh@altlinux.org>
      Signed-off-by: NMatthew Garrett <mjg@redhat.com>
      2c3422d9
    • A
      platform-drivers-x86: ideapad-laptop: add missing ideapad_input_exit in ideapad_acpi_add error path · 7451a55a
      Axel Lin 提交于
      In the case of ideapad_backlight_init() failure,
      we need to free the resources allocated by ideapad_input_init().
      
      Aslo drop __devexit annotation for ideapad_input_exit() because
      we also call it in ideapad_acpi_add() error path.
      Signed-off-by: NAxel Lin <axel.lin@gmail.com>
      Signed-off-by: NMatthew Garrett <mjg@redhat.com>
      7451a55a