summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-10-13gpio/omap: fix build error with certain OMAP1 configsJanusz Krzysztofik1-1/+1
With commit f64ad1a0e21a, "gpio/omap: cleanup _set_gpio_wakeup(), remove ifdefs", access to build time conditionally omitted 'suspend_wakeup' member of the 'gpio_bank' structure has been placed unconditionally in function _set_gpio_wakeup(), which is always built. This resulted in the driver compilation broken for certain OMAP1, i.e., non-OMAP16xx, configurations. Really required or not in previously excluded cases, define this structure member unconditionally as a fix. Tested with a custom OMAP1510 only configuration. Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> Acked-by: Kevin Hilman <khilman@ti.com> Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2011-10-13tile: revert change from <asm/atomic.h> to <linux/atomic.h> in asm filesChris Metcalf2-2/+2
The 32-bit TILEPro support uses some #defines in <asm/atomic_32.h> for atomic support routines in assembly. To make this more explicit, I've turned those includes into includes of <asm/atomic_32.h>, which should hopefully make it clear that they shouldn't be bombed into <linux/atomic.h> in any cleanups. Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
2011-10-13Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds5-13/+25
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: mscan: too much data copied to CAN frame due to 16 bit accesses gro: refetch inet6_protos[] after pulling ext headers bnx2x: fix cl_id allocation for non-eth clients for NPAR mode mlx4_en: fix endianness with blue frame support
2011-10-13ide: Fix file references in drivers/ide/Johann Felix Soden1-12/+12
Fix file references in drivers/ide/ There are a lot of file references to now moved or deleted files in the whole tree, especially in documentation and Kconfig files. This patch fixes the references in drivers/ide/. Signed-off-by: Johann Felix Soden <johfel@users.sourceforge.net> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-10-13Merge branch 'btrfs-3.0' of git://github.com/chrismason/linuxLinus Torvalds1-1/+10
* 'btrfs-3.0' of git://github.com/chrismason/linux: Btrfs: make sure not to defrag extents past i_size Btrfs: fix recursive auto-defrag
2011-10-12sparc: Avoid calling sigprocmask()David S. Miller3-3/+3
Use set_current_blocked() instead. Signed-off-by: David S. Miller <davem@davemloft.net>
2011-10-12sparc: Use set_current_blocked()Matt Fleming3-49/+30
As described in e6fa16ab ("signal: sigprocmask() should do retarget_shared_pending()") the modification of current->blocked is incorrect as we need to check whether the signal we're about to block is pending in the shared queue. Cc: Oleg Nesterov <oleg@redhat.com> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Matt Fleming <matt.fleming@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2011-10-12IPVS netns shutdown/startup dead-lockHans Schillstrom3-51/+87
ip_vs_mutext is used by both netns shutdown code and startup and both implicit uses sk_lock-AF_INET mutex. cleanup CPU-1 startup CPU-2 ip_vs_dst_event() ip_vs_genl_set_cmd() sk_lock-AF_INET __ip_vs_mutex sk_lock-AF_INET __ip_vs_mutex * DEAD LOCK * A new mutex placed in ip_vs netns struct called sync_mutex is added. Comments from Julian and Simon added. This patch has been running for more than 3 month now and it seems to work. Ver. 3 IP_VS_SO_GET_DAEMON in do_ip_vs_get_ctl protected by sync_mutex instead of __ip_vs_mutex as sugested by Julian. Signed-off-by: Hans Schillstrom <hans@schillstrom.com> Acked-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2011-10-12staging: xgifb: clean up 2nd display stateAaro Koskinen3-42/+44
Convert the display type to enum and rename disp_state to display2. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: delete CRT1 stateAaro Koskinen2-14/+0
The driver does not need to manage CRT1 state. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: make DAC tables constAaro Koskinen1-5/+6
DAC tables are read-only and can be made const. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: make RAM type tables constAaro Koskinen1-5/+5
RAM type tables are read-only and can be made const. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: move XGINew_DataBusWidth into vb_device_infoAaro Koskinen2-17/+16
Move the memory bus width info to vb_device_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: move XGINew_ChannelAB into vb_device_infoAaro Koskinen2-26/+27
Move the memory channel info into vb_device_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: move XGINew_RAMType into vb_device_infoAaro Koskinen2-57/+73
The RAM type is device specific, so move it into vb_device_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate global XGI_Pr dataAaro Koskinen3-17/+21
Move vb_device_info into xgifb_video_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: make XGIbios_mode constAaro Koskinen1-3/+2
Comments are wrong, the table is read-only and can be made const. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate filter_tb global variableAaro Koskinen2-1/+3
filter_tb is only used inside a single function, and it does not need to be static. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate XGIfb_fixAaro Koskinen2-8/+5
Eliminate XGIfb_fix and initialize needed fields of fb_info->fix in probe(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate default_varAaro Koskinen2-53/+32
Eliminate default_var and initialize needed fields of fb_info->var in probe(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate XGIfb_CRT2_write_enable variableAaro Koskinen2-10/+4
Replace XGIfb_CRT2_write_enable with IND_XGI_CRT2_WRITE_ENABLE_315. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: move pseudo_palette into xgifb_video_infoAaro Koskinen3-3/+3
pseudo_palette should be dynamically allocated for each fb. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: move XGIfb_rate_idx into xgifb_video_infoAaro Koskinen3-15/+19
The current refresh rate index should be stored in the device-specific data allocated in probe(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: move xgifb_mode_idx into xgifb_video_infoAaro Koskinen3-48/+56
The current mode index should be stored in the device-specific data allocated in probe(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate XGIfb_mode_noAaro Koskinen2-9/+6
We can get the information from the table with mode index. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: dynamically allocate xgifb_video_infoAaro Koskinen2-12/+6
Delete global xgi_video_info and dynamically allocate the data. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: avoid direct references xgi_video_infoAaro Koskinen1-249/+263
Avoid direct references to global xgi_video_info. This will help changing the data from statically allocated to dynamically allocated. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: rename struct video_info to xgifb_video_infoAaro Koskinen3-5/+5
Rename struct video_info to xgifb_video_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: add a global variable for the default refresh rateAaro Koskinen1-2/+4
Add a global variable for the default refresh rate. This is done to get rid of references to xgi_video_info before the probe routine, which should allocate the xgi_video_info dynamically in the future. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: inline XGIfb_query_VGA_config_space()Aaro Koskinen4-54/+11
XGIfb_query_VGA_config_space() is used only once during the init and can be replaced with a single PCI configuration space read. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate global XGIhw_ext dataAaro Koskinen3-49/+51
Move xgi_hw_device_info into xgi_video_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: eliminate global fb_info variableAaro Koskinen3-3/+5
Move fb_info into xgi_video_info. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: xgifb: use PCI drvdataAaro Koskinen1-8/+11
Don't access the global xgi_video_info directly in xgifb_remove(). Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: zcache: reduce tmem bucket lock contentionSeth Jennings1-1/+3
tmem uses hash buckets each with their own rbtree and lock to quickly lookup tmem objects. tmem has TMEM_HASH_BUCKETS (256) buckets per pool. However, because of the way the tmem_oid is generated for frontswap pages, only 16 unique tmem_oids are being generated, resulting in only 16 of the 256 buckets being used. This cause high lock contention for the per bucket locks. This patch changes SWIZ_BITS to include more bits of the offset. The result is that all 256 hash buckets are potentially used resulting in a 95% drop in hash bucket lock contention. Signed-off-by: Seth Jennings <sjenning@linux.vnet.ibm.com> Acked-by: Dan Magenheimer <dan.magenheimer@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-12staging: brcm80211: remove brcm80211 driver from the staging treeArend van Spriel81-97064/+0
With the mainline patch being applied to the wireless-next repository by John Linville this driver is no longer needed under the staging directory. This patch ends its life under the staging tree. Cc: John W. Linville <linville@tuxdriver.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Fix coding style issues in InterfaceMisc.cKevin McKinney1-166/+138
This patch cleans up several code style issues found in InterfaceMisc.c reported by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Remove assignment from if conditions reported by checkpatch.plKevin McKinney1-6/+10
This patch removes an assignment from three if conditions. In all three cases, the line of code was attempting to allocate memory, and check if the memory was allocated in the if statement. This issue was reported by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Fix coding style issues reported by checkpatch.plKevin McKinney1-12/+11
This patch cleans up several code style issues found in InterfaceInit.c reported by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Fix assignment issue in if statement reported by checkpatch.pl.Kevin McKinney1-1/+2
This patch fixes an error where an assignment "=" was being used in an if statement to determine if Firmware was downloaded. This patch removes that assignment, and places it above the if statement. The if statement then evaluates the status to verify if "0" successful, or != 0 failure. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Remove assignment in if condition reported by checkpatch.plKevin McKinney1-1/+2
There is a case where an assignment was being done in an if condition. This patch removes the assignment from the if condition and places the assignment above the if statement; thereby improving the readability of the code. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Replace dated variable __FUNCTION__ reported by checkpatch.plKevin McKinney1-6/+6
This patch replaces the obsolete variable, __FUNCTION__, that holds the name of the current function with variable, __func__. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11Staging: bcm: Fix coding style issues reported by checkpatch.plKevin McKinney1-1039/+788
This patch cleans up several hundred code style issues found in Misc.c reported by checkpatch.pl. Signed-off-by: Kevin McKinney <klmckinney1@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Update TODO listMark Einon1-2/+7
Added some more tasks to the TODO list, as highlighted by Francois Romieu <romieu@fr.zoreil.com>. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Remove unused mac definesMark Einon1-8/+0
Remove some unused defines from et1310_mac.c. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Fix et131x smatch issuesMark Einon1-2/+2
This fixes the following issues: et131x_initpci.c +488 et131x_adjust_link(45) error: we previously assumed 'phydev' could be null. et131x_initpci.c +504 et131x_adjust_link(61) warn: variable dereferenced before check 'phydev' Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Fix et131x sparse warningsMark Einon3-9/+9
This fixes the following warnings: et1310_mac.c:375:44: warning: incorrect type in initializer (different address spaces) et1310_mac.c:382:28: warning: incorrect type in argument 2 (different address spaces) et1310_mac.c:384:31: warning: incorrect type in argument 2 (different address spaces) et131x_initpci.c:555:5: warning: symbol 'et131x_mii_probe' was not declared. Should it be static? et131x_netdev.c:267:5: warning: symbol 'et131x_ioctl' was not declared. Should it be static? et131x_netdev.c:285:5: warning: symbol 'et131x_set_packet_filter' was not declared. Should it be static? et131x_netdev.c:347:6: warning: symbol 'et131x_multicast' was not declared. Should it be static? et131x_netdev.c:420:5: warning: symbol 'et131x_tx' was not declared. Should it be static? et131x_netdev.c:453:6: warning: symbol 'et131x_tx_timeout' was not declared. Should it be static? et131x_netdev.c:511:5: warning: symbol 'et131x_change_mtu' was not declared. Should it be static? et131x_netdev.c:564:5: warning: symbol 'et131x_set_mac_addr' was not declared. Should it be static? Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Remove file et131x_version.hMark Einon12-91/+10
Removed defines in et131x_version.h and replaced them by actual strings where convinient, or moved them to et131x.h Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Move pm calls from pci device to driver deviceMark Einon1-8/+12
Move the pci driver suspend/resume calls up to the driver.pm ops structure, as they are not pci device specific. Thanks to Francois Romieu <romieu@fr.zoreil.com> for pointing this out. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Remove error path from suspend/resume codeMark Einon3-32/+45
Removing an error path from et131x suspend/resume functions. Also added a call to phy_stop() to complement the phy_start() call during device start/stop routine. Thanks to Francois Romieu <romieu@fr.zoreil.com> for pointing this out. Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-10-11staging: et131x: Removing Olaf Hartmann's email as it bouncesMark Einon1-4/+1
On 3 October 2011 18:51, Uwe Ranft <uwe.ranft@telozo.com> wrote: > Hello, > olaf is not more longer owner of this e-mailadress. he has left our > company. > Please remove olaf fron the mailing list! > Best Regards > Uwe Signed-off-by: Mark Einon <mark.einon@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
generated by cgit v1.2.3 (git 2.39.0) at 2025-09-27 16:53:24 +0300