aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* [PATCH] m68knommu: sync syscalls with m68kGeert Uytterhoeven2006-10-13
| | | | | | | | m68knommu: sync syscalls with m68k Signed-Off-By: Geert Uytterhoeven <geert@linux-m68k.org> Signed-Off-By: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] thermal throttle: sysfs error checkingStephen Hemminger2006-10-13
| | | | | | | | Get rid of warning in the thermal throttling code about not checking sysfs return values. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] uml shouldn't do HEADERS_CHECKAl Viro2006-10-13
| | | | | | | The lack of asm-um/Kbuild is deliberate. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] Fix up mmap_kmemFranck Bui-Huu2006-10-13
| | | | | | | | | | | | | | | | | | | | | | | vma->vm_pgoff is an pfn _offset_ relatif to the begining of the memory start. The previous code was doing at first: vma->vm_pgoff << PAGE_SHIFT which results into a wrong physical address since some platforms have a physical mem start that can be different from 0. After that the previous call __pa() on this wrong physical address, however __pa() is used to convert a _virtual_ address into a physical one. This patch rewrites this convertion. It calculates the pfn of PAGE_OFFSET which is the pfn of the mem start then it adds the vma->vm_pgoff to it. It also uses virt_to_phys() instead of __pa() since the latter shouldn't be used by drivers. Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixesLinus Torvalds2006-10-13
|\ | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: [GFS2] Update git tree name/location [DLM] fix iovec length in recvmsg [GFS2] Pass the correct value to kunmap_atomic [GFS2] Fix bug where lock not held [DLM] Kconfig: don't show an empty DLM menu [GFS2] Fix uninitialised variable [GFS2] Fix a size calculation error
| * [GFS2] Update git tree name/locationSteven Whitehouse2006-10-12
| | | | | | | | | | | | | | | | | | The plan is to have two trees. One for bug fixes to be sent on a regular basis (-fixes) and another called -nmw which will contain items queued for the next merge window (hence the name). The -nmw tree will come & go according to need. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| * [DLM] fix iovec length in recvmsgPatrick Caulfield2006-10-12
| | | | | | | | | | | | | | | | The DLM always passes the iovec length as 1, this is wrong when the circular buffer wraps round. Signed-Off-By: Patrick Caulfield <pcaulfie@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| * [GFS2] Pass the correct value to kunmap_atomicRussell Cattelan2006-10-12
| | | | | | | | | | | | | | Pass kaddr rather than (incorrect) struct page to kunmap_atomic. Signed-off-by: Russell Cattelan <cattelan@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| * [GFS2] Fix bug where lock not heldSteven Whitehouse2006-10-12
| | | | | | | | | | | | | | The log lock needs to be held when manipulating the counter for the number of free journal blocks. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| * [DLM] Kconfig: don't show an empty DLM menuAdrian Bunk2006-10-12
| | | | | | | | | | | | | | | | | | | | | | Don't show an empty "Distributed Lock Manager" menu if IP_SCTP=n. Reported by Dmytro Bagrii in kernel Bugzilla #7268. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: David Teigland <teigland@redhat.com> Signed-off-by: Patrick Caulfield <pcaulfie@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| * [GFS2] Fix uninitialised variableSteven Whitehouse2006-10-12
| | | | | | | | | | | | | | | | This fixes a bug where, in certain cases an uninitialised variable could cause a dereference of a NULL pointer in gfs2_commit_write(). Also a typo in a comment is fixed at the same time. Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
| * [GFS2] Fix a size calculation errorRussell Cattelan2006-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a size calculation error. The size was incorrect being computed as a negative length and then being passed to an unsigned parameter. This in turn would cause the allocator to think it needed enough meta data to store a gigabyte file for every file created. Signed-off-by: Russell Cattelan <cattelan@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6Linus Torvalds2006-10-13
|\ \ | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/jejb/voyager-2.6: [VOYAGER] fix up ptregs removal mess [VOYAGER] fix up attribute packed specifiers in voyager.h [VOYAGER] fix genirq mess
| * | [VOYAGER] fix up ptregs removal messJames Bottomley2006-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently whoever converted voyager never actually checked that the patch would compile ... Remove as much of the pt_regs references as possible and move the remaining ones into line with what's in x86 generic. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * | [VOYAGER] fix up attribute packed specifiers in voyager.hJames Bottomley2006-10-12
| | | | | | | | | | | | | | | | | | | | | The old style (attribute on each structure entry) never really worked. Move it to an attribute per structure Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
| * | [VOYAGER] fix genirq messJames Bottomley2006-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of genirq in x86 completely broke voyager (and presumably visws). Since it's plugged into so much of the x86 infrastructure, you can't expect it to work unconverted. This patch introduces a voyager IRQ handler type and switches voyager to the genirq infrastructure. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
* | | [PATCH] Get core dump code to work...Petr Vandrovec2006-10-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file based core dump code was broken by pipe changes - a relative llseek returns the absolute file position on success, not the relative one, so dump_seek() always failed when invoked with non-zero current position. Only success/failure can be tested with relative lseek, we have to trust kernel that on success we've got right file offset. With this fix in place I have finally real core files instead of 1KB fragments... Signed-off-by: Petr Vandrovec <petr@vandrovec.name> [ Cleaned it up a bit while here - use SEEK_CUR instead of hardcoding 1 ] Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6Linus Torvalds2006-10-13
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: (27 commits) [CIFS] Missing flags2 for DFS [CIFS] Workaround incomplete byte length returned by some [CIFS] cifs Kconfig: don't select CONNECTOR [CIFS] Level 1 QPathInfo needed for proper OS2 support [CIFS] fix typo in previous patch [CIFS] Fix old DOS time conversion to handle timezone [CIFS] Do not need to adjust for Jan/Feb for leap day [CIFS] Fix leaps year calculation for years after 2100 [CIFS] readdir (ffirst) enablement of accurate timestamps from legacy servers [CIFS] Fix compiler warning with previous patch [CIFS] Fix typo [CIFS] Allow for 15 minute TZs (e.g. Nepal) and be more explicit about [CIFS] Fix readdir of large directories for backlevel servers [CIFS] Allow LANMAN21 support even in both POSIX non-POSIX path [CIFS] Make use of newer QFSInfo dependent on capability bit instead of [CIFS] Do not send newer QFSInfo to legacy servers which can not support it [CIFS] Fix typo in name of new cifs_show_stats [CIFS] Rename server time zone field [CIFS] Handle legacy servers which return undefined time zone [CIFS] CIFS support for /proc/<pid>/mountstats part 1 ... Manual conflict resolution in fs/cifs/connect.c
| * | [CIFS] Missing flags2 for DFSSteve French2006-10-12
| | | | | | | | | | | | | | | | | | Partly suggested by Igor Mammedov Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Workaround incomplete byte length returned by someSteve French2006-10-12
| | | | | | | | | | | | | | | | | | servers on small SMB responses Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] cifs Kconfig: don't select CONNECTORAndrew Morton2006-10-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `select' is a bit obnoxious: the option keeps on coming back and it's hard to work out what to do to make it go away again. The use of `depends on' is preferred (although it has usability problems too..) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Level 1 QPathInfo needed for proper OS2 supportSteve French2006-10-11
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] fix typo in previous patchSteve French2006-10-11
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Fix old DOS time conversion to handle timezoneSteve French2006-10-11
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Do not need to adjust for Jan/Feb for leap daySteve French2006-10-11
| | | | | | | | | | | | | | | | | | | | | calculation in 2100 (year divisible by 100) Signed-off-by: Yehuda Sadeh Weinraub <Yehuda.Sadeh@expand.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Fix leaps year calculation for years after 2100Steve French2006-10-10
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] readdir (ffirst) enablement of accurate timestamps from legacy serversSteve French2006-10-06
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Fix compiler warning with previous patchSteve French2006-10-02
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Fix typoSteve French2006-10-02
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Allow for 15 minute TZs (e.g. Nepal) and be more explicit aboutSteve French2006-10-02
| | | | | | | | | | | | | | | | | | | | | not setting time on close Signed-off-by: Guenter Kukkukk <linux@kukkukk.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Fix readdir of large directories for backlevel serversSteve French2006-10-01
| | | | | | | | | | | | | | | | | | (were not setting all of resume key) Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Allow LANMAN21 support even in both POSIX non-POSIX pathSteve French2006-09-30
| | | | | | | | | | | | | | | Signed-off-by: Guenter Kukkukk <linux@kukkukk.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Make use of newer QFSInfo dependent on capability bit instead ofSteve French2006-09-30
| | | | | | | | | | | | | | | | | | | | | whether we negotiated legacy lanman dialect so we do not keep retrying for mount to WindowsME Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Do not send newer QFSInfo to legacy servers which can not support itSteve French2006-09-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix dialect negotiation to save off when we have negotiated lanman. This allows us to avoid sending some somewhat newer requests that the server can not handle and go directly to the older version (infolevel) of the same call. Make sure we try to negotiate a level which allows us to get the server OS (which we check so we can detect Win9x vs. other legacy servers and eventually work around the Win9x DOS time bug (they reverse date/time fields). Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Fix typo in name of new cifs_show_statsSteve French2006-09-29
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Rename server time zone fieldSteve French2006-09-29
| | | | | | | | | | | | | | | | | | | | | | | | Server time zone is not really a time zone, rather a time adjustement in seconds. CC: Guenter Kukkukk <linux@kukkukk.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Handle legacy servers which return undefined time zoneSteve French2006-09-29
| | | | | | | | | | | | | | | Signed-off-by: Guenter Kukkukk <linux@kukkukk.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] CIFS support for /proc/<pid>/mountstats part 1Steve French2006-09-28
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Fix build break ifdef in wrong placeSteve French2006-09-28
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] More removing of unused functionsSteve French2006-09-28
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Remove unused prototypesSteve French2006-09-28
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Fix build breakSteve French2006-09-28
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Remove static and unused symbolsSteve French2006-09-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Most cases of the ones found by Shaggy by "make namespacecheck" could be removed or made static Ack: Dave Kleikamp <shaggy@austin.ibm.com> Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | [CIFS] Legacy time handling for Win9x and OS/2 part 1Steve French2006-09-27
| | | | | | | | | | | | Signed-off-by: Steve French <sfrench@us.ibm.com>
| * | CIFS: Use SEEK_END instead of hardcoded valueSteve French2006-09-23
| | | | | | | | | | | | | | | Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net> Signed-off-by: Steve French <sfrench@us.ibm.com>
* | | [PATCH] more kernel_execve() fallout (sbus)Al Viro2006-10-12
| | | | | | | | | | | | | | | | | | | | | | | | drivers/sbus/char stuff using kernel_execve() needs linux/syscalls.h now; includes trimmed, while we are at it. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] Fix build breakage with CONFIG_X86_VSMPRavikiran Thirumalai2006-10-12
| | | | | | | | | | | | | | | | | | | | | | | | Kernel build breaks with CONFIG_X86_VSMP. Probably due to some header file cleanups in 2.6.19-rc1. Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | [PATCH] fixing includes in alpha_ksyms.cAl Viro2006-10-12
| | | | | | | | | | | | | | | | | | | | | kernel_execve() fallout Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | | Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6Linus Torvalds2006-10-12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: SH-4A UBC support sh: interrupt exception handling rework sh: Default enable R7780RP IRQs. sh: Zero-out coherent buffer in consistent_alloc(). sh: Convert IPR-IRQ to IRQ chip. sh: Convert INTC2 IRQ handler to irq_chip. sh: Fix pr_debug statements for sh4 sh: Convert r7780rp IRQ handler to IRQ chip. sh: Updates for IRQ handler changes. sh: Kill off timer_ops get_frequency(). sh: First step at generic timeofday support.
| * | | sh: SH-4A UBC supportRyusuke Sakato2006-10-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A simple patch to enable the UBC on SH-4A. Signed-off-by: Ryusuke Sakato <sakato@hsdv.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>