]> pilppa.org Git - linux-2.6-omap-h63xx.git/log
linux-2.6-omap-h63xx.git
17 years agobnx2: Remove the rx_offset field from the bnx2 structure.
Benjamin Li [Sat, 17 May 2008 05:18:57 +0000 (22:18 -0700)]
bnx2: Remove the rx_offset field from the bnx2 structure.

The rx_offset field is set to a constant value and initialized
only once.  By replacing all references to the rx_offset field,
we can eliminate rx_offset from the bnx2 structure.  This will
save 4 bytes for every bnx2 instance.

[Added parentheses to the definition of BNX2_RX_OFFSET, as noted
by Ben Hutchings.]

Signed-off-by: Benjamin Li <benli@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agobnx2: Add EEH PCI recovery.
Wendy Xiong [Sat, 17 May 2008 05:18:21 +0000 (22:18 -0700)]
bnx2: Add EEH PCI recovery.

Add PCI recovery functions to the driver.  The initial pci state is
also saved so the the MSI state can be restored during PCI recovery.

Signed-off-by: Wendy Xiong <wendyx@us.ibm.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agobnx2: Allow phy reset to be skipped during chip reset.
Michael Chan [Sat, 17 May 2008 05:17:45 +0000 (22:17 -0700)]
bnx2: Allow phy reset to be skipped during chip reset.

Andy Gospodarek <andy@greyhouse.net> found that netconsole would
panic when resetting bnx2 devices.

>From Andy:
"The issue is the bnx2_set_link in bnx2_init_nic will print a link-status
message before we are fully initialized and ready to start polling.
Polling is currently disabled in this state, but since the
__LINK_STATE_RX_SCHED is overloaded to not only try and disable polling
but also to make the system aware there is something waiting to be
polled, we really have to fix this in drivers.

The problematic call is the one to netif_rx_complete as it tries to
remove an entry from the poll_list when there isn't one."

While this netconsole problem should be fixed separately, we really
should not reset the PHY when changing ring sizes, MTU, or other
similar settings.  The PHY reset causes several seconds of unnecessary
link disruptions.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Acked-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years ago[CIFS] add more complete mount options to cifs_show_options
Steve French [Sat, 17 May 2008 03:12:45 +0000 (03:12 +0000)]
[CIFS] add more complete mount options to cifs_show_options

adds various options to cifs_show_options
(displayed when you cat /proc/mounts with a cifs mount).  I limited
the new ones to values that are associated with the mount with the
exception of "seal" (which is a per tree connection property, but I
thought was important enough to show through).

Eventually cifs's parse_mount_options also needs to
be rewritten to use the match_token API but that would be a big enough
change that I would prefer that changing parse_mount_options wait
until next release.

Signed-off-by: Steve French <sfrench@us.ibm.com>
17 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Linus Torvalds [Fri, 16 May 2008 22:39:28 +0000 (15:39 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Update defconfig.
  sparc64: Fix lmb_reserve() args in find_ramdisk().

17 years agoIB/mthca: Fix max_sge value returned by query_device
Roland Dreier [Fri, 16 May 2008 21:58:44 +0000 (14:58 -0700)]
IB/mthca: Fix max_sge value returned by query_device

The mthca driver returns the maximum number of scatter/gather entries
returned by the firmware as the max_sge value when device properties
are queried.  However, the firmware also reports a limit on the
maximum descriptor size allowed, and because mthca takes into account
the worst case send request overhead when checking whether to allow a
QP to be created, the largest number of scatter/gather entries that
can be used with mthca may be limited by the maximum descriptor size
rather than just by the actual s/g entry limit.

This means that applications cannot actually create QPs with
max_send_sge equal to the limit returned by ib_query_device().  Fix
this by checking if the maximum descriptor size imposes a lower limit
and if so returning that lower limit.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
17 years agoRDMA/cxgb3: Fix uninitialized variable warning in iwch_post_send()
Roland Dreier [Fri, 16 May 2008 21:58:40 +0000 (14:58 -0700)]
RDMA/cxgb3: Fix uninitialized variable warning in iwch_post_send()

    drivers/infiniband/hw/cxgb3/iwch_qp.c: In function 'iwch_post_send':
    drivers/infiniband/hw/cxgb3/iwch_qp.c:232: warning: 't3_wr_flit_cnt' may be used uninitialized in this function

This is what akpm describes as "the dopey
gcc-doesn't-know-that-foo(&var)-writes-to-var problem."

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Acked-by: Steve Wise <swise@opengridcomputing.com>
17 years agoIB/mlx4: Fix uninitialized-var warning in mlx4_ib_post_send()
Andrew Morton [Fri, 16 May 2008 21:28:30 +0000 (14:28 -0700)]
IB/mlx4: Fix uninitialized-var warning in mlx4_ib_post_send()

    drivers/infiniband/hw/mlx4/qp.c: In function 'mlx4_ib_post_send':
    drivers/infiniband/hw/mlx4/qp.c:1460: warning: 'seglen' may be used uninitialized in this function

This is the dopey gcc-doesn't-know-that-foo(&var)-writes-to-var problem.

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
17 years ago[PATCH] return to old errno choice in mkdir() et.al.
Al Viro [Thu, 15 May 2008 08:49:12 +0000 (04:49 -0400)]
[PATCH] return to old errno choice in mkdir() et.al.

In case when both EEXIST and EROFS would apply we used to
return the former in mkdir(2) and friends.  Lest anyone suspects
us of being consistent, in the same situation knfsd gave clients
nfs_erofs...

ro-bind series had switched the syscall side of things to
returning -EROFS and immediately broke an application - namely,
mkdir -p.  Patch restores the original behaviour...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
17 years ago[Patch] fs/binfmt_elf.c: fix wrong return values
WANG Cong [Thu, 8 May 2008 13:52:33 +0000 (21:52 +0800)]
[Patch] fs/binfmt_elf.c: fix wrong return values

create_elf_tables() returns 0 on success. But when strnlen_user() "fails",
it returns 0 directly. So this is wrong.

Signed-off-by: WANG Cong <wangcong@zeuux.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
17 years ago[PATCH] get rid of leak in compat_execve()
Al Viro [Sat, 10 May 2008 20:38:25 +0000 (16:38 -0400)]
[PATCH] get rid of leak in compat_execve()

Even though copy_compat_strings() doesn't cache the pages,
copy_strings_kernel() and stuff indirectly called by e.g.
->load_binary() is doing that, so we need to drop the
cache contents in the end.

[found by WANG Cong <wangcong@zeuux.org>]

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
17 years ago[Patch] fs/binfmt_elf.c: fix a wrong free
WANG Cong [Tue, 6 May 2008 04:45:35 +0000 (12:45 +0800)]
[Patch] fs/binfmt_elf.c: fix a wrong free

In kmalloc failing path, we shouldn't free pointers in 'info',
because the struct 'info' is uninitilized when kmalloc is called.

And when kmalloc returns NULL, it's needless to kfree it.

Signed-off-by: WANG Cong <wangcong@zeuux.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Reviewed-by: Pekka Enberg <penberg@cs.helsinki.fi>
--
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
17 years ago[PATCH] avoid multiplication overflows and signedness issues for max_fds
Al Viro [Sat, 10 May 2008 14:08:32 +0000 (10:08 -0400)]
[PATCH] avoid multiplication overflows and signedness issues for max_fds

Limit sysctl_nr_open - we don't want ->max_fds to exceed MAX_INT and
we don't want size calculation for ->fd[] to overflow.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
17 years ago[PATCH] dup_fd() part 4 - race fix
Al Viro [Fri, 9 May 2008 01:19:42 +0000 (21:19 -0400)]
[PATCH] dup_fd() part 4 - race fix

Parent _can_ be a clone task, contrary to the comment.  Moreover,
more files could be opened while we allocate a copy, in which case
we end up copying only part into new descriptor table.  Since what
we get _is_ affected by all changes in the old range, we can get
rather weird effects - e.g.
dup2(0, 1024); close(0);
in parallel with fork() resulting in child that sees the effect of
close(), but not that of dup2() done just before that close().

What we need is to recalculate the open_count after having reacquired
->file_lock and if external fdtable we'd just allocated is too small for
it, free the sucker and redo allocation.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
17 years ago[PATCH] dup_fd() - part 3
Al Viro [Fri, 9 May 2008 01:11:17 +0000 (21:11 -0400)]
[PATCH] dup_fd() - part 3

merge alloc_files() into dup_fd(), leave setting newf->fdt until the end

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
17 years ago[PATCH] dup_fd() part 2
Al Viro [Fri, 9 May 2008 01:02:45 +0000 (21:02 -0400)]
[PATCH] dup_fd() part 2

use alloc_fdtable() instead of expand_files(), get rid of pointless
grabbing newf->file_lock, kill magic in copy_fdtable() that used to
be there only to skip copying when called from dup_fd().

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
17 years ago[PATCH] dup_fd() fixes, part 1
Al Viro [Thu, 8 May 2008 23:42:56 +0000 (19:42 -0400)]
[PATCH] dup_fd() fixes, part 1

Move the sucker to fs/file.c in preparation to the rest

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
17 years ago[PATCH] take init_files to fs/file.c
Al Viro [Thu, 8 May 2008 22:19:16 +0000 (18:19 -0400)]
[PATCH] take init_files to fs/file.c

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
17 years agowireless: Create 'device' symlink in sysfs
Masakazu Mokuno [Wed, 14 May 2008 05:16:50 +0000 (14:16 +0900)]
wireless: Create 'device' symlink in sysfs

Some network interfaces of the wireless drivers lack the 'device'
symlink in sysfs.
This patch lets the drivers create the links.

Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agowireless, airo: waitbusy() won't delay
Roel Kluin [Tue, 13 May 2008 20:12:27 +0000 (22:12 +0200)]
wireless, airo: waitbusy() won't delay

There will be no delay even when COMMAND_BUSY (defined 0x8000) is set:
0x8000 & (delay < 10000) will evaluate to 0 - when delay is 0.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agolibertas: fix command timeout after firmware failure
Brian Cavagnolo [Tue, 13 May 2008 12:54:59 +0000 (13:54 +0100)]
libertas: fix command timeout after firmware failure

This is a fix for OLPC ticket #6586: "SCAN command fails, timer doesn't
fire". In fact, the timer was firing; the problem was that the dnld_sent
state variable was not being updated after the timer expired, so
lbs_execute_next_command was not being called.

Signed-off-by: Brian Cavagnolo <brian@cozybit.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agomac80211: Add RTNL version of ieee80211_iterate_active_interfaces
Ivo van Doorn [Sat, 10 May 2008 11:40:49 +0000 (13:40 +0200)]
mac80211: Add RTNL version of ieee80211_iterate_active_interfaces

Since commit e38bad4766a110b61fa6038f10be16ced8c6cc38
mac80211: make ieee80211_iterate_active_interfaces not need rtnl
rt2500usb and rt73usb broke down due to attempting register access
in atomic context (which is not possible for USB hardware).

This patch restores ieee80211_iterate_active_interfaces() to use RTNL lock,
and provides the non-RTNL version under a new name:
ieee80211_iterate_active_interfaces_atomic()

So far only rt2x00 uses ieee80211_iterate_active_interfaces(), and those
drivers require the RTNL version of ieee80211_iterate_active_interfaces().
Since they already call that function directly, this patch will automatically
fix the USB rt2x00 drivers.

v2: Rename ieee80211_iterate_active_interfaces_rtnl

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agomac80211 : Association with 11n hidden ssid ap.
Abhijeet Kolekar [Fri, 9 May 2008 16:35:41 +0000 (09:35 -0700)]
mac80211 : Association with 11n hidden ssid ap.

This patch fixes the association problem with 11n hidden ssid ap.
Patch fixes the problem of associating with hidden ssid when
all three parameters ap,essid and channel are given to iwconfig.
This patch removes the condition of checking three parameters
and always checks for bss in bss list while associating.

Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agoInput: gpio-keys debouncing support
Dmitry Baryshkov [Wed, 7 May 2008 20:30:15 +0000 (16:30 -0400)]
Input: gpio-keys debouncing support

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agosparc64: Update defconfig.
David S. Miller [Fri, 16 May 2008 20:36:27 +0000 (13:36 -0700)]
sparc64: Update defconfig.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agosparc64: Fix lmb_reserve() args in find_ramdisk().
David S. Miller [Thu, 15 May 2008 06:10:33 +0000 (23:10 -0700)]
sparc64: Fix lmb_reserve() args in find_ramdisk().

This fixes the missing ram regression reported by
Mikael Pettersson <mikpe@it.uu.se>, much thanks for
all of this help in diagnosing this.

The second argument to lmb_reserve() is a size,
not an end address bounds.

Tested-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: David S. Miller <davem@davemloft.net>
17 years agoInput: add support for SuperH MigoR touchscreen
Magnus Damm [Wed, 7 May 2008 15:15:02 +0000 (11:15 -0400)]
Input: add support for SuperH MigoR touchscreen

This is V2 of the MigoR touch screen driver. The chip we interface to
is unfortunately a custom designed microcontroller speaking some
undocumented protocol over i2c.

The board specific code is expected to register this device as an i2c
chip using struct i2c_board_info [] and i2c_register_board_info().

[dtor@mail.ru: don't enable touchscreen if there are no users]
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agobyteorder: don't directly include linux/byteorder/generic.h
Harvey Harrison [Fri, 16 May 2008 18:20:25 +0000 (11:20 -0700)]
byteorder: don't directly include linux/byteorder/generic.h

Use asm/byteorder.h instead.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoARM: OMAP: Move sram-fn.S from plat-omap to mach-omap1
Tony Lindgren [Fri, 16 May 2008 18:45:46 +0000 (11:45 -0700)]
ARM: OMAP: Move sram-fn.S from plat-omap to mach-omap1

This file is omap1 specific.

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoInput: remove unused defines
Joe Perches [Wed, 7 May 2008 15:15:23 +0000 (11:15 -0400)]
Input: remove unused defines

Remove unused to_dev, to_handler, to_handle from include/linux/input.h
Move to_handle_h from include/linux/input.h to drivers/char/keyboard.c

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoInput: libps2 - remove delayed command execution
Dmitry Torokhov [Tue, 6 May 2008 16:11:39 +0000 (12:11 -0400)]
Input: libps2 - remove delayed command execution

Delayed command execution is not used by anyone so let's remove it.

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoInput: gameport - remove rescan/reconnect facilities
Dmitry Torokhov [Tue, 6 May 2008 16:11:29 +0000 (12:11 -0400)]
Input: gameport - remove rescan/reconnect facilities

They have never been used and are unlikely to be used in the future
so remove them altogether.

Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoInput: hil_ptr - check return value of input_register_device()
Andres Salomon [Tue, 6 May 2008 16:10:39 +0000 (12:10 -0400)]
Input: hil_ptr - check return value of input_register_device()

[dtor@mail.ru: also signal correct return value to callers]
Signed-off-by: Andres Salomon <dilinger@debian.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoInput: appletouch - simplify touchpad type detection
Sven Anders [Tue, 6 May 2008 03:57:10 +0000 (23:57 -0400)]
Input: appletouch - simplify touchpad type detection

This patch simplifies type detection and removes unnecessary code.

Signed-off-by: Sven Anders <anders@anduras.de>
[jberg: don't typedef, checkpatch clean, remove useless comments, ...]
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoInput: appletouch - miscellaneous code cleanups
Johannes Berg [Tue, 6 May 2008 03:56:55 +0000 (23:56 -0400)]
Input: appletouch - miscellaneous code cleanups

This patch does some code cleanups in appletouch:
 * useless comment removal
 * make almost checkpatch clean
 * make sparse clean

Signed-off-by: Sven Anders <anders@anduras.de>
[jberg: most of the changes including removing much of the original patch]
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoInput: adbhid - capslock and power button fix
Rodney Lorrimar [Mon, 5 May 2008 15:59:24 +0000 (11:59 -0400)]
Input: adbhid - capslock and power button fix

If the adbhid module parameter restore_capslock_events is used,
pressing the power button may confuse the capslock state. This is
because the power button release scancode (0xff) is sometimes the same
as the capslock press/release scancode.

This fix adds yet another flag to track the state of the power button
so that it works independently of capslock.

Signed-off-by: Rodney Lorrimar <rodney@rodney.id.au>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoInput: adbhid - fix capslock key state after suspend
Rodney Lorrimar [Mon, 5 May 2008 15:59:00 +0000 (11:59 -0400)]
Input: adbhid - fix capslock key state after suspend

If the adbhid module parameter restore_capslock_events is used,
sometimes capslock will get stuck down after resuming.

My fix is to remember the capslock state before suspend and then
ignore the first 'caps lock key down' message after resume if the
capslock LED was on before suspending.

Signed-off-by: Rodney Lorrimar <rodney@rodney.id.au>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoHWMON: hdaps - set up phys and bus type of input device
Dmitry Torokhov [Mon, 5 May 2008 15:53:45 +0000 (11:53 -0400)]
HWMON: hdaps - set up phys and bus type of input device

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoInput: use clamp_val() macro in ff-memless.c
Harvey Harrison [Mon, 5 May 2008 15:50:59 +0000 (11:50 -0400)]
Input: use clamp_val() macro in ff-memless.c

Replace two opencoded nested min/max macros with clamp_val().

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoInput: wacom - make one-bit signed bitfields unsigned
Harvey Harrison [Mon, 5 May 2008 15:50:40 +0000 (11:50 -0400)]
Input: wacom - make one-bit signed bitfields unsigned

Otherwise it can only take the values 0/-1 which doesn't seem to
have been intended.

drivers/input/tablet/wacom.h:108:12: error: dubious one-bit signed bitfield

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoInput: wacom - cleanup handling of tablet IDs
Ping Cheng [Mon, 5 May 2008 15:36:41 +0000 (11:36 -0400)]
Input: wacom - cleanup handling of tablet IDs

Signed-off-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years ago[CIFS] Add missing defines for DFS
Steve French [Fri, 16 May 2008 18:48:38 +0000 (18:48 +0000)]
[CIFS] Add missing defines for DFS

Also has minor cleanup of previous patch

CC: Igor Mammedov <niallain@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
17 years agoInput: replace remaining __FUNCTION__ occurrences
Harvey Harrison [Mon, 5 May 2008 15:36:18 +0000 (11:36 -0400)]
Input: replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
17 years agoCIFSGetDFSRefer cleanup + dfs_referral_level_3 fixed to conform REFERRAL_V3 the MS...
Igor Mammedov [Fri, 16 May 2008 09:06:30 +0000 (13:06 +0400)]
CIFSGetDFSRefer cleanup + dfs_referral_level_3 fixed to conform REFERRAL_V3 the MS-DFSC spec.

Signed-off-by: Igor Mammedov <niallain@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
17 years agoARM: OMAP: This patch adds the driver to turn on the TFP410 framer to get DVI output...
Koen Kooi [Fri, 16 May 2008 10:16:54 +0000 (12:16 +0200)]
ARM: OMAP: This patch adds the driver to turn on the TFP410 framer to get DVI output working on the beagleboard

The default resolution is 1024x768@24bit

This version addresses the comments from Felipe Balbi adn Arun Edarath

Signed-off-by: Koen Kooi <koen@openembedded.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: Add default kernel config for OMAP LDP
Nishant Kamat [Thu, 15 May 2008 14:42:41 +0000 (09:42 -0500)]
ARM: OMAP: Add default kernel config for OMAP LDP

This patch adds a default config for the OMAP LDP platform. It supports
UART, touchscreen, RTC, Mentor USB and MMC drivers.

Signed-off-by: Nishant Kamat <nskamat@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: Add basic board support for OMAP LDP.
Nishant Kamat [Thu, 15 May 2008 14:42:40 +0000 (09:42 -0500)]
ARM: OMAP: Add basic board support for OMAP LDP.

This adds basic board support for the OMAP3430 LDP development platform.
It adds support for the touchscreen, RTC, UART, USB and MMC - all of which
work with little or no changes w.r.t. the OMAP3430 SDP.

Signed-off-by: Nishant Kamat <nskamat@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: Add register defines for TWL4030 vaux1
Nishant Kamat [Thu, 15 May 2008 14:42:39 +0000 (09:42 -0500)]
ARM: OMAP: Add register defines for TWL4030 vaux1

This patch adds the register defines for TWL4030 VAUX1.

Signed-off-by: Nishant Kamat <nskamat@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoclock34xx.c: fix spinlock reentry in omap3_noncore_dpll_enable()
Paul Walmsley [Thu, 15 May 2008 20:48:20 +0000 (14:48 -0600)]
clock34xx.c: fix spinlock reentry in omap3_noncore_dpll_enable()

omap3_noncore_dpll_enable() calls clk_get_rate(), which causes an attempt
to re-enter the clockfw_lock spinlock.  Fix by calling
omap2_get_dpll_rate() instead.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoChip message format is either 8-bit cmd or 8-bit cmd + 16-bit data.
Roman Tereshonkov [Thu, 15 May 2008 15:44:27 +0000 (18:44 +0300)]
Chip message format is either 8-bit cmd or 8-bit cmd + 16-bit data.

Fix the touchscreen input device name.

No need in msg.spi = ts->spi assignments. It is done in
spi_async called from spi_sync.

No need in driver bus assignment. It is done in spi_driver_register.

Signed-off-by: Roman Tereshonkov <roman.tereshonkov@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoI2C: TSL2563, LP5521, TEA5761: Refer to id_table in i2c_driver structures
Jarkko Nikula [Thu, 15 May 2008 13:48:08 +0000 (16:48 +0300)]
I2C: TSL2563, LP5521, TEA5761: Refer to id_table in i2c_driver structures

Continue following commits since otherwise probe functions are not called.

11f26b681796e5f40d83321ea66e6fafa8f121d7
5744c1ebdd713c68fc3f1a93942d2baa8d139e79
0b80905e9c1f81085069c502662ba122437d6a7c

Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com>
Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
17 years agoN800: Select tcm825x only if wanted
Sakari Ailus [Wed, 14 May 2008 12:05:33 +0000 (15:05 +0300)]
N800: Select tcm825x only if wanted

Don't enable automatically TCM825x on N800 unless
VIDEO_HELPER_CHIPS_AUTO is selected.

Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoN810: Don't export camera orientation
Sakari Ailus [Wed, 14 May 2008 12:05:32 +0000 (15:05 +0300)]
N810: Don't export camera orientation

On Nokia N810 the camera module is mounted upside down. This affects
the mirroring controls. This patch inverts the controls for N810.

Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoTCM825x: Include invertation of image mirroring in configuration
Sakari Ailus [Wed, 14 May 2008 12:05:31 +0000 (15:05 +0300)]
TCM825x: Include invertation of image mirroring in configuration

Add invertation of image mirroring register bits to default
configuration.

This is useful when the camera module is e.g. mounted upside down.

Signed-off-by: Sakari Ailus <sakari.ailus@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agonfs: make nfs4_drop_state_owner() static
Adrian Bunk [Fri, 2 May 2008 20:42:45 +0000 (13:42 -0700)]
nfs: make nfs4_drop_state_owner() static

nfs4_drop_state_owner() can now become static.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
17 years agonfs: path_{get,put}() cleanups
Jan Blunck [Fri, 2 May 2008 20:42:45 +0000 (13:42 -0700)]
nfs: path_{get,put}() cleanups

Here are some more places where path_{get,put}() can be used instead of
dput()/mntput() pair.

Signed-off-by: Jan Blunck <jblunck@suse.de>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
17 years agonfs: replace remaining __FUNCTION__ occurrences
Harvey Harrison [Fri, 2 May 2008 20:42:44 +0000 (13:42 -0700)]
nfs: replace remaining __FUNCTION__ occurrences

__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
17 years agonfs/lsm: make NFSv4 set LSM mount options
Eric Paris [Fri, 2 May 2008 20:42:42 +0000 (13:42 -0700)]
nfs/lsm: make NFSv4 set LSM mount options

NFSv3 get_sb operations call into the LSM layer to set security options passed
from userspace.  NFSv4 hooks were not originally added since it was reasonably
late in the merge window and NFSv3 was the only thing that had regressed (v4
has never supported any LSM options)

This patch makes NFSv4 call into the LSM to set security options rather than
just blindly dropping them with no notice to the user as happens today.  This
patch was tested in a simple NFSv4 environment with the context= option and
appeared to work as expected.

Signed-off-by: Eric Paris <eparis@redhat.com>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Cc: "J. Bruce Fields" <bfields@fieldses.org>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Acked-by: James Morris <jmorris@namei.org>
Cc: Casey Schaufler <casey@schaufler-ca.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
17 years agoNFSv4: Check the return value of decode_compound_hdr_arg()
Trond Myklebust [Tue, 6 May 2008 17:32:40 +0000 (13:32 -0400)]
NFSv4: Check the return value of decode_compound_hdr_arg()

If decode_compound_hdr_arg() returns a resource error, then we cannot
proceed to process the callback. Return a 'GARBAGE_ARGS' rpc-level error to
the caller instead.
If, however, the minor version field is incorrect, then we need to
propagate the resulting NFS4ERR_MINOR_VERS_MISMATCH error back as the
compound status field (setting the nops field to 0).

Finally, if encode_compound_hdr_res() returns an error, we need to return
an RPC_SYSTEM_ERR to the caller.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
17 years agonfs: fix race in nfs_dirty_request
Fred Isaman [Thu, 1 May 2008 17:03:22 +0000 (20:03 +0300)]
nfs: fix race in nfs_dirty_request

When called from nfs_flush_incompatible, the req is not locked, so
req->wb_page might be set to NULL before it is used by PageWriteback.

Signed-off-by: Fred Isaman <iisaman@citi.umich.edu>
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
17 years agoNFS: Ensure that 'noac' and/or 'actimeo=0' turn off attribute caching
Trond Myklebust [Mon, 5 May 2008 15:45:41 +0000 (11:45 -0400)]
NFS: Ensure that 'noac' and/or 'actimeo=0' turn off attribute caching

Both the 'noac' and 'actimeo=0' mount options should ensure that attributes
are not cached, however a bug in nfs_attribute_timeout() means that
currently, the attributes may in fact get cached for up to one jiffy. This
has been seen to cause corruption in some applications.

The reason for the bug is that the time_in_range() test returns 'true' as
long as the current time lies between nfsi->read_cache_jiffies and
nfsi->read_cache_jiffies + nfsi->attrtimeo. In other words, if jiffies
equals nfsi->read_cache_jiffies, then we still cache the attribute data.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
17 years agoARM: OMAP: board-omap3beagle: fix merge-damage in RTC code
Koen Kooi [Thu, 15 May 2008 07:34:43 +0000 (09:34 +0200)]
ARM: OMAP: board-omap3beagle: fix merge-damage in RTC code

This patch fixes the merge-damage in the beagleboard RTC code

Signed-off-by: Koen Kooi <koen@openembedded.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoFixed DFS code to work with new 'build_path_from_dentry', that returns full path...
Igor Mammedov [Fri, 16 May 2008 09:10:32 +0000 (13:10 +0400)]
Fixed DFS code to work with new 'build_path_from_dentry', that returns full path if share in the dfs, now.

Signed-off-by: Igor Mammedov <niallain@gmail.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
17 years agomutex-debug: check mutex magic before owner
Jeremy Kerr [Wed, 14 May 2008 23:22:58 +0000 (16:22 -0700)]
mutex-debug: check mutex magic before owner

Currently, the mutex debug code checks the lock->owner before lock->magic, so
a corrupt mutex will most likely result in failing the owner check, rather
than the magic check.

This change to debug_mutex_unlock does the magic check first, so
we have a better idea of what breaks.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years ago[POWERPC] Move of_device_get_modalias to drivers/of
Stephen Rothwell [Fri, 16 May 2008 01:57:45 +0000 (11:57 +1000)]
[POWERPC] Move of_device_get_modalias to drivers/of

Commit 140b932f8cb6cced10b96860651a198b1b89cbb9 ("Create modalias file
in sysfs for of_platform bus") needs this to avoid breaking the sparc
builds.

Just move the code and add whitespace around some binary operators.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Get most of ioctl.h content from <asm-generic/ioctl.h>
Robert P. J. Day [Wed, 14 May 2008 19:16:44 +0000 (05:16 +1000)]
[POWERPC] Get most of ioctl.h content from <asm-generic/ioctl.h>

Now that <asm-generic/ioctl.h> allows overriding of the most commonly
changed macros, take advantage of that.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Add 6xx-style HID0_SLEEP support.
Scott Wood [Mon, 28 Apr 2008 15:38:13 +0000 (01:38 +1000)]
[POWERPC] Add 6xx-style HID0_SLEEP support.

This adds a function to put a 6xx/7xx/7xxx/83xx family CPU into sleep
mode, and return after an interrupt has occurred.  It expects to be
called with interrupts disabled, and returns with interrupts disabled.
Interrupts are enabled while the processor is asleep, but the interrupt
that wakes the processor is not handled; it is still pending when this
function returns.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years ago[POWERPC] Defer processing of interrupts when the CPU wakes from sleep mode
Paul Mackerras [Wed, 14 May 2008 04:30:48 +0000 (14:30 +1000)]
[POWERPC] Defer processing of interrupts when the CPU wakes from sleep mode

This provides a way to defer processing of an interrupt that wakes the
processor out of sleep mode.  On 32-bit platforms that use an
interrupt to wake the processor, we have to have interrupts enabled in
hardware at the point where we go to sleep, otherwise the processor
will never wake up.  However, because interrupts are logically
disabled at this point, we don't want to process the interrupt
straight away.

This is handled by setting the _TLF_SLEEPING flag.  When we get an
interrupt and _TLF_SLEEPING is set, we firstly clear the MSR_EE
(external interrupt enable) bit in the saved MSR value, and secondly
we then return to the address in the link register, like we do for
_TLF_NAPPING, but without actually handling the interrupt.

Note that this is handled somewhat differently on powerbooks, so this
new code will only be used on non-Apple machines.

Signed-off-by: Paul Mackerras <paulus@samba.org>
17 years agoMerge branch 'linux-2.6' into powerpc-next
Paul Mackerras [Fri, 16 May 2008 13:13:42 +0000 (23:13 +1000)]
Merge branch 'linux-2.6' into powerpc-next

17 years agosh: use the common ascii hex helpers
Harvey Harrison [Mon, 12 May 2008 19:05:43 +0000 (12:05 -0700)]
sh: use the common ascii hex helpers

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
17 years agosh: fix sh7785 master clock value
Yoshihiro Shimoda [Thu, 15 May 2008 08:44:00 +0000 (17:44 +0900)]
sh: fix sh7785 master clock value

Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
17 years agosh: Fix up thread info pointer in syscall_badsys resume path.
Hideo Saito [Thu, 15 May 2008 04:30:05 +0000 (13:30 +0900)]
sh: Fix up thread info pointer in syscall_badsys resume path.

Entry to resume_userspace expects r8 to contain current_thread_info,
which happens in all paths except for syscall_badsys, where r8 was
being inadvertently trampled. Reload it before the branch.

Signed-off-by: Hideo Saito <saito@densan.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
17 years agosh: Fix up optimized SH-4 memcpy on big endian.
Hideo Saito [Thu, 15 May 2008 04:28:46 +0000 (13:28 +0900)]
sh: Fix up optimized SH-4 memcpy on big endian.

Signed-off-by: Hideo Saito <saito@densan.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
17 years agosh: disable initrd defaults in .empty_zero_page.
Paul Mundt [Tue, 13 May 2008 08:41:46 +0000 (17:41 +0900)]
sh: disable initrd defaults in .empty_zero_page.

When using initramfs on systems that don't explicitly clear LOADER_TYPE,
unpack_to_rootfs() tramples tramples the range with the defaults taken
out of .empty_zero_page. This causes kernels with valid initramfs images
to bail out with crc or gzip magic mismatch errors after the second
unpack takes place on certain platform configurations.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
17 years agosh: display boot params by default on entry.
Paul Mundt [Tue, 13 May 2008 08:40:17 +0000 (17:40 +0900)]
sh: display boot params by default on entry.

Some kernel and boot loader configurations tweak the .empty_zero_page
settings, while others do not. Print the values out on entry as a
debugging aid.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
17 years agoMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
Linus Torvalds [Fri, 16 May 2008 01:28:46 +0000 (18:28 -0700)]
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] macintosh: Replace deprecated __initcall with device_initcall
  [POWERPC] cell: Fix section mismatches in io-workarounds code
  [POWERPC] spufs: Fix compile error
  [POWERPC] Fix uninitialized variable bug in copy_{to|from}_user
  [POWERPC] Add null pointer check to of_find_property
  [POWERPC] vmemmap fixes to use smaller pages
  [POWERPC] spufs: Fix pointer reference in find_victim
  [POWERPC] 85xx: SBC8548 - Add flash support and HW Rev reporting
  [POWERPC] 85xx: Fix some sparse warnings for 85xx MDS
  [POWERPC] 83xx: Enable DMA engine on the MPC8377 MDS board.
  [POWERPC] 86xx: mpc8610_hpcd: fix second serial port
  [POWERPC] 86xx: mpc8610_hpcd: add support for NOR and NAND flashes
  [POWERPC] 85xx: Add 8568 PHY workarounds to board code
  [POWERPC] 86xx: mpc8610_hpcd: use ULI526X driver for on-board ethernet

17 years agoMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Linus Torvalds [Fri, 16 May 2008 01:28:28 +0000 (18:28 -0700)]
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
  jbd2: update transaction t_state to T_COMMIT fix
  ext4: Retry block allocation if new blocks are allocated from system zone.
  ext4: mballoc fix mb_normalize_request algorithm for 1KB block size filesystems
  ext4: fix typos in messages and comments (journalled -> journaled)
  ext4: fix synchronization of quota files in journal=data mode
  ext4: Fix mount messages when quota disabled
  ext4: correct mount option parsing to detect when quota options can be changed

17 years agoinitcalls: Fix m68k build and possible buffer overflow
Cyrill Gorcunov [Thu, 15 May 2008 20:52:41 +0000 (13:52 -0700)]
initcalls: Fix m68k build and possible buffer overflow

This patch fixes a build bug on m68k - gcc decides to emit a call to the
strlen library function, which we don't implement.

More importantly - my previous patch "init: don't lose initcall return
values" (commit e662e1cfd434aa234b72fbc781f1d70211cb785b) had introduced
potential buffer overflow by wrong calculation of string accumulator
size.

Use strlcat() instead, fixing both bugs.

Many thanks Andreas Schwab and Geert Uytterhoeven for helping
to catch and fix the bug.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoSplit up 'do_initcalls()' into two simpler functions
Linus Torvalds [Fri, 16 May 2008 01:14:01 +0000 (18:14 -0700)]
Split up 'do_initcalls()' into two simpler functions

One function to just loop over the entries, one function to actually do
the call and the associated debugging code.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoClean up 'print_fn_descriptor_symbol()' types
Linus Torvalds [Fri, 16 May 2008 00:50:37 +0000 (17:50 -0700)]
Clean up 'print_fn_descriptor_symbol()' types

Everybody wants to pass it a function pointer, and in fact, that is what
you _must_ pass it for it to make sense (since it knows that ia64 and
ppc64 use descriptors for function pointers and fetches the actual
address from there).

So don't make the argument be a 'unsigned long' and force everybody to
add a cast.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years agoInput: Fix lm8323 probe and module unloading
Tony Lindgren [Tue, 13 May 2008 05:53:07 +0000 (22:53 -0700)]
Input: Fix lm8323 probe and module unloading

Make module unloading and reloading behave:

- Driver probe could fail if input_register_device fails as
  no error was returned from probe

- Driver interrupt was using unused platform_data field,
  change to use i2c platform data interrupt instead

- Free resources on unloading module

- Mark platform data as __init_or_module

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoCBUS: Checkpatch.pl fixes for retu-wdt.c
Tony Lindgren [Mon, 12 May 2008 23:15:33 +0000 (16:15 -0700)]
CBUS: Checkpatch.pl fixes for retu-wdt.c

Checkpatch.pl fixes for retu-wdt.c

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoCBUS: Fix retu mutex handling
Tony Lindgren [Sun, 11 May 2008 16:51:45 +0000 (09:51 -0700)]
CBUS: Fix retu mutex handling

Fix retu mutex handling. Also use mutex_lock instead of unhandled
mutex_lock_interruptible.

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: DMA clean-up
Tony Lindgren [Thu, 15 May 2008 23:39:22 +0000 (16:39 -0700)]
ARM: OMAP: DMA clean-up

DMA clean-up, mostly checkpatch.pl fixes.

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: Remove __REG access in DMA code
Tony Lindgren [Wed, 30 Apr 2008 04:35:45 +0000 (21:35 -0700)]
ARM: OMAP: Remove __REG access in DMA code

Remove __REG access in DMA code, use dma_read/write instead:

- dynamically set the omap_dma_base based on the omap type

- omap_read/write becomes dma_read/write
- dma channel registers are read with dma_ch_read/write

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: Make DMA channels dynamic for multi-boot
Tony Lindgren [Tue, 29 Apr 2008 03:01:13 +0000 (20:01 -0700)]
ARM: OMAP: Make DMA channels dynamic for multi-boot

Make DMA channels dynamic for multi-boot

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP3: Add sram34xx.S
Karthik Dasu [Thu, 15 May 2008 21:27:08 +0000 (14:27 -0700)]
ARM: OMAP3: Add sram34xx.S

This patch adds sram34xx.S for programming the core DPLL.

It is based on Karthik's earlier patch and TI's sram-fn_34xxS from:

http://linux.omap.com/pub/kernel/3430zoom/linux-ldp-v1.0b.tar.gz

Patch modified by Tony for the new register access.

Signed-off-by: Karthik Dasu<karthik-dp@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agoARM: OMAP: Fix sdrc.h and powerdomain.c for assembly
Tony Lindgren [Thu, 15 May 2008 23:39:16 +0000 (16:39 -0700)]
ARM: OMAP: Fix sdrc.h and powerdomain.c for assembly

Fix sdrc.h and powerdomain.c for assembly

Signed-off-by: Tony Lindgren <tony@atomide.com>
17 years agofix parenthesis in include/asm-arm/arch-omap/control.h
Mariusz Kozlowski [Thu, 15 May 2008 23:03:53 +0000 (16:03 -0700)]
fix parenthesis in include/asm-arm/arch-omap/control.h

Parenthesis fix in include/asm-arm/arch-omap/control.h

Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
17 years agoIB/ipath: Fix UC receive completion opcode for RDMA WRITE with immediate
Ralph Campbell [Thu, 15 May 2008 23:37:25 +0000 (16:37 -0700)]
IB/ipath: Fix UC receive completion opcode for RDMA WRITE with immediate

When I fixed the RC receive completion opcode in 2bfc8e9e ("IB/ipath:
Return the correct opcode for RDMA WRITE with immediate"), I forgot to
fix UC, which had the same problem for RDMA write with immediate
returning the wrong opcode.

Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
17 years agoIB/ipath: Fix printk format for ipath_sdma_status
Roland Dreier [Thu, 15 May 2008 22:28:55 +0000 (15:28 -0700)]
IB/ipath: Fix printk format for ipath_sdma_status

Commit f018c7e1 ("IB/ipath: Change ipath_devdata.ipath_sdma_status to be
unsigned long") changed ipath_sdma_status to be unsigned long, but left
a few debug messages that printed it out with a %016llx format, which
generates the warnings

    drivers/infiniband/hw/ipath/ipath_sdma.c:348: warning: format '%016llx' expects type 'long long unsigned int', but argument  3 has type 'long unsigned int'
    drivers/infiniband/hw/ipath/ipath_sdma.c:618: warning: format '%016llx' expects type 'long long unsigned int', but argument  3 has type 'long unsigned int'

Fix this by changing the format used to print out the value to %08lx
(8 hex digits are now sufficient, because the highest bit used is 31).

Warnings reported by Randy Dunlap <randy.dunlap@oracle.com>.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
17 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Thu, 15 May 2008 20:56:42 +0000 (13:56 -0700)]
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] fix personality(PER_LINUX32) performance issue
  [IA64] Properly unregister legacy interrupts
  [IA64] Remove NULL pointer check for argument never passed as NULL.
  [IA64] trivial cleanup for perfmon.c
  [IA64] trivial cleanup for entry.S
  [IA64] fix interrupt masking for pending works on kernel leave
  [IA64] allow user to force_pal_cache_flush
  [IA64] Don't reserve crashkernel memory > 4 GB
  [IA64] machvec support for SGI UV platform
  [IA64] Add header files for SGI UV platform

17 years agohostap: fix "registers" registration in procfs
Mathieu Chouquet-Stringer [Wed, 14 May 2008 23:03:18 +0000 (19:03 -0400)]
hostap: fix "registers" registration in procfs

The "registers" entry was incorrectly created in the procfs root instead
of the device specific directory.  Move "registers" registration
immediately after the containing procfs directory is created.

Signed-off-by: Mathieu Chouquet-Stringer <mchouque@free.fr>
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
17 years agojbd2: update transaction t_state to T_COMMIT fix
Mingming Cao [Thu, 15 May 2008 18:46:17 +0000 (14:46 -0400)]
jbd2: update transaction t_state to T_COMMIT fix

Updating the current transaction's t_state is protected by j_state_lock.  We
need to do the same when updating the t_state to T_COMMIT.

Acked-by: Jan Kara <jack@suse.cz>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
17 years agoext4: Retry block allocation if new blocks are allocated from system zone.
Aneesh Kumar K.V [Thu, 15 May 2008 18:43:20 +0000 (14:43 -0400)]
ext4: Retry block allocation if new blocks are allocated from system zone.

If the block allocator gets blocks out of system zone ext4 calls
ext4_error. But if the file system is mounted with errors=continue
retry block allocation. We need to mark the system zone blocks as
in use to make sure retry don't pick them again

System zone is the block range mapping block bitmap, inode bitmap and inode
table.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
17 years agotty: fix BKL related leak and crash
Ingo Molnar [Wed, 14 May 2008 15:11:46 +0000 (17:11 +0200)]
tty: fix BKL related leak and crash

Enabling the BKL to be lockdep tracked uncovered the following
upstream kernel bug in the tty code, which caused a BKL
reference leak:

  ================================================
  [ BUG: lock held when returning to user space! ]
  ------------------------------------------------
  dmesg/3121 is leaving the kernel with locks still held!
  1 lock held by dmesg/3121:
   #0:  (kernel_mutex){--..}, at: [<c02f34d9>] opost+0x24/0x194

this might explain some of the atomicity warnings and crashes
that -tip tree testing has been experiencing since the BKL
was converted back to a spinlock.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
17 years ago[IA64] fix personality(PER_LINUX32) performance issue
Huang, Xiaolan [Thu, 15 May 2008 02:18:41 +0000 (10:18 +0800)]
[IA64] fix personality(PER_LINUX32) performance issue

The patch aims to fix a performance issue for the syscall
personality(PER_LINUX32).

On IA-64 box, the syscall personality (PER_LINUX32) has poor performance
because it failed to find the Linux/x86 execution domain. Then it tried
to load the kernel module however it failed always and it used the default
execution domain PER_LINUX instead. Requesting kernel modules is very
expensive. It caused the performance issue. (see the function
lookup_exec_domain in kernel/exec_domain.c).

To resolve the issue, execution domain Linux/x86 is always registered in
initialization time for IA-64 architecture.

Signed-off-by: Xiaolan Huang <xiaolan.huang@intel.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
17 years ago[CIFS] enable parsing for transport encryption mount parm
Steve French [Thu, 15 May 2008 16:44:38 +0000 (16:44 +0000)]
[CIFS] enable parsing for transport encryption mount parm

Samba now supports transport encryption on particular exports
(mounted tree ids can be encrypted for servers which support the
unix extensions).  This adds parsing support to cifs mount
option parsing for this.

Signed-off-by: Steve French <sfrench@us.ibm.com>
17 years agoMerge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
Linus Torvalds [Thu, 15 May 2008 16:10:13 +0000 (09:10 -0700)]
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
  [S390] show_interrupts: prevent cpu hotplug when walking cpu_online_map.
  [S390] smp: __smp_call_function_map vs cpu_online_map fix.
  [S390] tape: Use ccw_dev_id to build cdev_id.
  [S390] dasd: fix timeout handling in interrupt handler
  [S390] s390dbf: Use const char * for dbf name.
  [S390] dasd: Use const in busid functions.
  [S390] blacklist.c: removed duplicated include
  [S390] vmlogrdr: module initialization function should return negative errors
  [S390] sparsemem vmemmap: initialize memmap.
  [S390] Remove last traces of cio_msg=.
  [S390] cio: Remove CCW_CMD_SUSPEND_RECONN in front of CCW_CMD_SET_PGID.

17 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
Linus Torvalds [Thu, 15 May 2008 16:09:43 +0000 (09:09 -0700)]
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  arch/parisc/kernel/perf_asm.S: build fix
  parisc: remove -traditional from assembler flags
  parisc: use conditional macro for 64-bit wide ops
  parisc: Remove ioctl.h content picked up from <asm-generic/ioctl.h>.
  arch/parisc/kernel/unaligned.c: use time_* macros
  parisc: remove redundant display of free swap space in show_mem()
  drivers/parisc: replace remaining __FUNCTION__ occurrences
  parisc: replace remaining __FUNCTION__ occurrences
  parisc: new termios definitions
  parisc: fix trivial section name warnings