aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* NLM: Fix sparse warningsTrond Myklebust2007-05-143-6/+5
| | | | | | | | | | | | | | | - fs/lockd/xdr4.c:140:27: warning: incorrect type in argument 2 (different explicit signedness) - fs/lockd/xdr4.c:141:27: warning: incorrect type in argument 2 (different explicit signedness) - fs/lockd/xdr4.c:432:28: warning: incorrect type in argument 2 (different explicit signedness) - fs/lockd/xdr4.c:433:28: warning: incorrect type in argument 2 (different explicit signedness) - fs/lockd/xdr4.c:587:20: warning: symbol 'nlm_version4' was not declared. Should it be static? Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
* NFS: Fix more sparse warningsTrond Myklebust2007-05-142-5/+5
| | | | | | | | | | | | | | | | | | - fs/nfs/nfs4xdr.c:2499:42: warning: incorrect type in argument 2 (different signedness) - fs/nfs/nfs4xdr.c:2658:49: warning: incorrect type in argument 4 (different explicit signedness) - fs/nfs/nfs4xdr.c:2683:50: warning: incorrect type in argument 4 (different explicit signedness) - fs/nfs/nfs4xdr.c:3063:68: warning: incorrect type in argument 4 (different explicit signedness) - fs/nfs/nfs4xdr.c:3065:68: warning: incorrect type in argument 4 (different explicit signedness) - fs/nfs/callback_xdr.c:138:31: warning: incorrect type in argument 2 (different signedness) Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
* NFS: Fix some 'sparse' warnings...Trond Myklebust2007-05-145-8/+8
| | | | | | | | | | | | | | - fs/nfs/dir.c:610:8: warning: symbol 'nfs_llseek_dir' was not declared. Should it be static? - fs/nfs/dir.c:636:5: warning: symbol 'nfs_fsync_dir' was not declared. Should it be static? - fs/nfs/write.c:925:19: warning: symbol 'req' shadows an earlier one - fs/nfs/write.c:61:6: warning: symbol 'nfs_commit_rcu_free' was not declared. Should it be static? - fs/nfs/nfs4proc.c:793:5: warning: symbol 'nfs4_recover_expired_lease' was not declared. Should it be static? Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
* SUNRPC: remove dead variable 'rpciod_running'Christoph Hellwig2007-05-141-2/+0
| | | | | | | | | rpciod_running is not used at all, but due to the way DECLARE_MUTEX_LOCKED works we don't get a warning for it. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
* NFS4: Fix incorrect use of sizeof() in fs/nfs/nfs4xdr.cTrond Myklebust2007-05-142-46/+47
| | | | | | | | | | | | | | The XDR code should not depend on the physical allocation size of structures like nfs4_stateid and nfs4_verifier since those may have to change at some future date. We therefore replace all uses of sizeof() with constants like NFS4_VERIFIER_SIZE and NFS4_STATEID_SIZE. This also has the side-effect of fixing some warnings of the type format ‘%u’ expects type ‘unsigned int’, but argument X has type ‘long unsigned int’ on 64-bit systems Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
* NFS: use zero_user_pageNate Diller2007-05-142-6/+6
| | | | | | | | | | Use zero_user_page() instead of the newly deprecated memclear_highpage_flush(). Signed-off-by: Nate Diller <nate.diller@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>
* NLM: don't use CLONE_SIGHAND in nlmclnt_recoveryOleg Nesterov2007-05-141-1/+1
| | | | | | | | | | | reclaimer() calls allow_signal() which plays with parent process's ->sighand. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Cc: Trond Myklebust <trond.myklebust@fys.uio.no> Cc: "J. Bruce Fields" <bfields@fieldses.org> Cc: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
* NLM: Fix locking client timeouts...Trond Myklebust2007-05-141-1/+1
| | | | | | nlmsvc_timeout is already in units of HZ... Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
* Revert "ipmi: add new IPMI nmi watchdog handling"Linus Torvalds2007-05-145-102/+42
| | | | | | | | | | | | | | | | | | This reverts commit f64da958dfc83335de1d2bef9d3868f30feb4e53. Andi Kleen is unhappy with the changes, and they really do not seem worth it. IPMI could use DIE_NMI_IPI instead of the new callback, even though that ends up having its own set of problems too, mainly because the IPMI code cannot really know the NMI was from IPMI or not. Manually fix up conflicts in arch/x86_64/kernel/traps.c and drivers/char/ipmi/ipmi_watchdog.c. Cc: Andi Kleen <ak@suse.de> Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> Cc: Corey Minyard <minyard@acm.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge branch 'for-linus' of ↵Linus Torvalds2007-05-145-46/+35
|\ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: pxamci: fix PXA27x MMC workaround for bad CRC with 136 bit response mmc: use assigned major for block device sdhci: handle dma boundary interrupts mmc: au1xmmc command types check from data flags
| * pxamci: fix PXA27x MMC workaround for bad CRC with 136 bit responseNicolas Pitre2007-05-141-12/+6
| | | | | | | | | | | | | | ... and make it depend on the response flag instead of the command type. Signed-off-by: Nicolas Pitre <npitre@mvista.com> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
| * mmc: use assigned major for block devicePierre Ossman2007-05-142-13/+6
| | | | | | | | | | | | | | The MMC block devices now have an assigned major. Make sure we actually use it. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
| * sdhci: handle dma boundary interruptsPierre Ossman2007-05-141-0/+9
| | | | | | | | | | | | | | | | When the device hits certain memory boundaries, it signals an interrupt and expects to be serviced. We don't need the feature but we need to make sure the device doesn't stall. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
| * mmc: au1xmmc command types check from data flagsYoichi Yuasa2007-05-141-21/+14
| | | | | | | | | | | | | | | | | | | | This patch has changed command types check from data flags. MMC_STOP_TRANSMISSION is never passed to au1xmmc_send_command(). SEND_STOP() is used for MMC_STOP_TRANSMISSION. Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2007-05-145-3/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPV4] SNMP: Display new statistics at /proc/net/netstat [IPV6]: Reverse sense of promisc tests in ip6_mc_input [NET_SCHED]: prio qdisc boundary condition [IPSEC]: Don't warn if high-order hash resize fails [IPSEC]: Check validity of direction in xfrm_policy_byid
| * | [IPV4] SNMP: Display new statistics at /proc/net/netstatMitsuru Chinen2007-05-141-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This displays the statistics specified in the updated IP-MIB RFC (RFC4293) in /proc/net/netstat. The reason why these are not displayed in /proc/net/snmp is that some existing utilities are developed under the assumption which ipstat items in /proc/net/snmp is unchanged. Signed-off-by: Mitsuru Chinen <mitch@linux.vnet.ibm.com> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IPV6]: Reverse sense of promisc tests in ip6_mc_inputCorey Mutter2007-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reverse the sense of the promiscuous-mode tests in ip6_mc_input(). Signed-off-by: Corey Mutter <crm-netdev@mutternet.com> Signed-off-by: David L Stevens <dlstevens@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET_SCHED]: prio qdisc boundary conditionJamal Hadi Salim2007-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes an out-of-boundary condition when the classified band equals q->bands. Caught by Alexey Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IPSEC]: Don't warn if high-order hash resize failsHerbert Xu2007-05-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-page allocations are always likely to fail. Since such failures are expected and non-critical in xfrm_hash_alloc, we shouldn't warn about them. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [IPSEC]: Check validity of direction in xfrm_policy_byidHerbert Xu2007-05-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function xfrm_policy_byid takes a dir argument but finds the policy using the index instead. We only use the dir argument to update the policy count for that direction. Since the user can supply any value for dir, this can corrupt our policy count. I know this is the problem because a few days ago I was deleting policies by hand using indicies and accidentally typed in the wrong direction. It still deleted the policy and at the time I thought that was cool. In retrospect it isn't such a good idea :) I decided against letting it delete the policy anyway just in case we ever remove the connection between indicies and direction. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2007-05-1413-108/+152
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Update defconfig. [VIDEO]: XVR-500 and XVR-2500 need FB=y. [SPARC32]: asm/system.h needs asm/smp.h [SPARC32]: Update defconfig. [SPARC32]: Fix sparc32 kdebug changes. [SPARC64]: Accept ebus_bus_type for generic DMA ops. [SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling. [SCSI]: Add help text for SCSI_ESP_CORE. [SPARC] SBUS: display7seg.c needs asm/io.h [SPARC] SBUS: bbc_i2c.c needs asm/io.h [SPARC64]: Be more resiliant with PCI I/O space regs. [SERIAL] SUNHV: Add an ID string.
| * | | [SPARC64]: Update defconfig.David S. Miller2007-05-141-22/+4
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [VIDEO]: XVR-500 and XVR-2500 need FB=y.David S. Miller2007-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise the allmodconfig build breaks. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC32]: asm/system.h needs asm/smp.hDavid S. Miller2007-05-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | To get hard_smp_processor_id() even on UP builds. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC32]: Update defconfig.David S. Miller2007-05-141-65/+86
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC32]: Fix sparc32 kdebug changes.Robert Reif2007-05-142-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix recent kdebug changes to compile on sparc32. Signed-off-by: Robert Reif <reif@earthlink.net> Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Accept ebus_bus_type for generic DMA ops.David S. Miller2007-05-141-14/+30
| | | | | | | | | | | | | | | | | | | | | | | | Based upon a bug report by Meelis Roos. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling.David S. Miller2007-05-141-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SCSI]: Add help text for SCSI_ESP_CORE.David S. Miller2007-05-131-0/+8
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC] SBUS: display7seg.c needs asm/io.hDavid S. Miller2007-05-131-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC] SBUS: bbc_i2c.c needs asm/io.hDavid S. Miller2007-05-131-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SPARC64]: Be more resiliant with PCI I/O space regs.David S. Miller2007-05-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If we miss on the ranges, just toss the translation up to the parent instead of failing. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | | [SERIAL] SUNHV: Add an ID string.David S. Miller2007-05-131-0/+4
| | |/ | |/| | | | | | | | | | | | | | | | The 'compatible' property can be SUNW,sun4v-console as well as 'qcn'. Signed-off-by: David S. Miller <davem@davemloft.net>
* | | Declare another couple of compat syscalls.Stephen Rothwell2007-05-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | compat_sys_signalfd and compat_sys_timerfd need declarations before PowerPC can wire them up. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | MAINTAINERS update.Dave Jones2007-05-141-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've not really 'maintained' this code for years, and others are doing a much more thorough job these days. Removing myself might stem some of the crazier emails I get. Signed-off-by: Dave Jones <davej@redhat.com> Acked-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | | timekeeping fix patch got mis-appliedThomas Gleixner2007-05-142-2/+2
| |/ |/| | | | | | | | | | | | | | | | | | | The time keeping code move to kernel/time/timekeeping.c broke the clocksource resume logic patch, which got applied to the old file by a fuzzy application. Fix it up and move the clocksource_resume() call to the appropriate place. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> [ tssk, tssk, everybody should use --fuzz=0 ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | fix deadlock in loop.cAl Viro2007-05-131-8/+9
|/ | | | | | | | | | | | | | | | ... doh Jeremy Fitzhardinge noted that the recent loop.c cleanups worked, but cause lockdep to complain. Ouch. OK, the deadlock is real and yes, I'm an idiot. Speaking of which, we probably want to s/lock/pin/ in drivers/base/map.c to avoid such brainos again. And yes, this stuff needs clear documentation. Will try to put one together once I get some sleep... Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Jeremy Fitzhardinge <jeremy@goop.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Linux 2.6.22-rc1Linus Torvalds2007-05-121-2/+2
| | | | .. close the merge window
* Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2007-05-12139-548/+8624
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits) [ARM] Use new get_irqnr_preamble [ARM] Ensure machine class menu is sorted alphabetically [ARM] 4333/2: KS8695: Micrel Development board [ARM] 4332/2: KS8695: Serial driver [ARM] 4331/3: Support for Micrel/Kendin KS8695 processor [ARM] 4371/1: AT91: Support for Atmel AT91SAM9RL-EK development board [ARM] 4372/1: Define byte sizes in asm-arm/sizes.h [ARM] 4370/3: AT91: Support for Atmel AT91SAM9RL processors. [ARM] Update mach-types [ARM] export symbol csum_partial_copy_from_user [ARM] iop13xx: msi support [ARM] stacktrace fix [ARM] Spinlock initializer cleanup [ARM] remove useless config option GENERIC_BUST_SPINLOCK [ARM] 4303/3: base kernel support for TI DaVinci [ARM] 4369/1: AT91: Fix circular dependency in header files [ARM] 4368/1: S3C24xx: build fix [ARM] 4364/1: AT91: LEDS on AT91SAM9261-EK [ARM] Fix iop32x/iop33x build [ARM] EBSA110: fix build errors caused by missing "const" ...
| * Merge branch 'fixes' into develRussell King2007-05-1219-55/+115
| |\
| | * Merge branch 'omap-fixes' into fixesRussell King2007-05-126-20/+80
| | |\
| | | * ARM: OMAP: Fix section mismatch warningTony Lindgren2007-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fix section mismatch warning Signed-off-by: Tony Lindgren <tony@atomide.com>
| | | * ARM: OMAP: 24xx pinmux updatesKyungmin Park2007-05-103-7/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some OMAP 24xx pin mux declarations to support: - TUSB 6010 EVM (on H4) - All three full speed USB ports - GPIOs used with USB0 on Apollon and H4 For OMAP2, issue MUX_WARNINGS and debug messages correctly; and make the message look more like the OMAP1 message. Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
| | | * ARM: OMAP: Remove old PM_SUSPEND_DISKTony Lindgren2007-05-101-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove old PM_SUSPEND_DISK. Also some minor cosmetic clean-up. Signed-off-by: Tony Lindgren <tony@atomide.com>
| | | * ARM: OMAP: Fix warning in dma.cTony Lindgren2007-05-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fix warning: 'offset' might be uninitialized Signed-off-by: Tony Lindgren <tony@atomide.com>
| | * | [ARM] export symbol csum_partial_copy_from_userFrederik Deweerdt2007-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've got the following linking error when building 2.6.21-mm2 on ARM: ERROR: "csum_partial_copy_from_user" [net/rxrpc/af-rxrpc.ko] undefined! Linking fails because "csum_partial_copy_from_user" is not exported to modules. This patch adds it to the list of exported symbols. Signed-off-by: Frederik Deweerdt <frederik.deweerdt@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] stacktrace fixAndrew Morton2007-05-111-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab1b6f03a10ba1f5638188ab06bf46e33ac3a160 said - remove the unused task argument to save_stack_trace, it's always current then broke arm: arch/arm/kernel/stacktrace.c:56: error: conflicting types for 'save_stack_trace' include/linux/stacktrace.h:11: error: previous declaration of 'save_stack_trace' was here arch/arm/kernel/stacktrace.c:56: error: conflicting types for 'save_stack_trace' include/linux/stacktrace.h:11: error: previous declaration of 'save_stack_trace' was here Cc: Christoph Hellwig <hch@lst.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] 4369/1: AT91: Fix circular dependency in header filesAndrew Victor2007-05-114-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve the circular dependency in the AT91 header files (io.h and hardware.h) by moving the at91_sys_read() and at91_sys_write() functions to io.h Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] 4368/1: S3C24xx: build fixArnaud Patard2007-05-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to build current git tree fails. The failure is due to commit 25ff0a653067eec56efc730dbed664d5cc77e9f3. The patch title say it's for OMAP board while it's applied on S3C2410 Kconfig entry. Moreover, the OMAP entry is already selecting GENERIC_TIME. This patch reverts the offending commit. Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| | * | [ARM] 4364/1: AT91: LEDS on AT91SAM9261-EKAndrew Victor2007-05-112-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attached you can find a patch needed to make the LEDS for 'CPU-Idle' and 'Timer' work on the AT91SAM9261-EK board. The kernel configuration options are already there, but the implementation is not available. Signed-off-by: Remy Bohmer <l.pinguin@gmail.com> Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
generated by cgit v1.1 at 2024-12-27 11:38:10 +0000