14 May, 2010
5 commits
-
This removes an empty menu for most platforms.
Signed-off-by: Wolfram Sang
Acked-by: Florian Fainelli
Signed-off-by: Jiri Kosina -
Signed-off-by: Andreas Dilger
Acked-by: KOSAKI Motohiro
Signed-off-by: Jiri Kosina -
Change max6875.c header file to format as in conventions
Signed-off-by: Abraham Arce
Acked-by: Wolfram Sang
Signed-off-by: Jiri Kosina -
Change eeprom_93cx6.c header file to format as in conventions
Signed-off-by: Abraham Arce
Acked-by: Wolfram Sang
Signed-off-by: Jiri Kosina -
Change eeprom.c header file to format as in conventions
Signed-off-by: Abraham Arce
Acked-by: Jean Delvare
Acked-by: Wolfram Sang
Signed-off-by: Jiri Kosina
11 May, 2010
7 commits
-
Fixes sparse warning:
drivers/char/agp/generic.c:1217:33: warning: Using plain integer as
NULL pointerSigned-off-by: Bill Pemberton
CC: linux-kernel@vger.kernel.org
Signed-off-by: Jiri Kosina -
Fix sparse warning:
include/linux/rtc-v3020.h:18:23: error: dubious one-bit signed bitfield
Signed-off-by: Bill Pemberton
CC: p_gortmaker@yahoo.com
Signed-off-by: Jiri Kosina -
Fix sparse warning:
drivers/pci/pci.h:247:25: error: dubious one-bit signed bitfield
Signed-off-by: Bill Pemberton
CC: linux-pci@vger.kernel.org
Signed-off-by: Jiri Kosina -
Fixes sparse warning:
fs/jbd2/journal.c:1892:9: warning: Using plain integer as NULL pointer
Signed-off-by: Bill Pemberton
CC: linux-ext4@vger.kernel.org
Signed-off-by: Jiri Kosina -
Fix sparse warnings:
drivers/block/cciss.c:1591:37: warning: symbol 'i' shadows an earlier one
drivers/block/cciss.c:2437:21: warning: symbol 'i' shadows an earlier oneSigned-off-by: Bill Pemberton
Acked-by: Mike Miller
Signed-off-by: Jiri Kosina -
Replace the introduced i_sem by an i_mutex in the filesystem locking
documentation. This was introduced [1] after all occurrences were
already replaced in the same text [2]. However, the term "inode
semaphore" has not been replaced then, and it's replaced now.[1] afddba49d18f346e5cc2938b6ed7c512db18ca68
[2] a7bc02f4f47fd0e7860c6589f0ad000d1476f7a3Signed-off-by: Thadeu Lima de Souza Cascardo
Cc: Nick Piggin
Cc: Artem Bityutskiy
Cc: Randy Dunlap
Cc: Christoph Hellwig
Cc: Al Viro
Signed-off-by: Jiri Kosina -
The i386 subarch happens to pull in original NR_syscalls. Maybe we can
make that work for all host arch, but for now just avoid the clash by
using an all-upper-case name.CC arch/um/kernel/skas/syscall.o/data/linux-2.6/arch/um/kernel/skas/syscall.c:13:1: warning: "NR_syscalls" redefined
In file included from /data/linux-2.6/arch/x86/include/asm/unistd.h:3,
from /data/linux-2.6/arch/um/sys-i386/shared/sysdep/syscalls.h:6,
from /data/linux-2.6/arch/um/kernel/skas/syscall.c:10:
/data/linux-2.6/arch/x86/include/asm/unistd_32.h:349:1: warning: this is the location of the previous definitionSigned-off-by: Jan Kiszka
Signed-off-by: Jiri Kosina
10 May, 2010
1 commit
-
s/seperate/separate
Signed-off-by: Anand Gadiyar
Signed-off-by: Jiri Kosina
03 May, 2010
1 commit
-
Since the drivers probe call was changed from .init.text
to .devinit.text in commit c2e13037e6794bd0d9de3f9ecabf5615f15c160b
the fb_fix_screeninfo structure must be
changed from .init.data to .devinit.data, too.Signed-off-by: Henrik Kretzschmar
Tested-by: Ralf Baechle
Signed-off-by: Jiri Kosina
28 Apr, 2010
1 commit
-
The location of the sparse web page and git tree were no longer
valid. This changes them to point to the current versions.Signed-off-by: Bill Pemberton
Signed-off-by: Jiri Kosina
26 Apr, 2010
2 commits
-
discontiguous => discontinuous
coealesce => coalesceSigned-off-by: Thomas Weber
Signed-off-by: Jiri Kosina -
This is just a cleanup and doesn't change how the code works.
The original code had a mix of returns and gotos so I changed everything
to just return directly.Signed-off-by: Dan Carpenter
Reviewed-by: Christoph Lameter
Signed-off-by: Jiri Kosina
23 Apr, 2010
2 commits
-
Fix obvious cases of "it's" being used when "its" was meant.
Signed-off-by: Francis Galiegue
Acked-by: Randy Dunlap
Signed-off-by: Jiri Kosina
22 Apr, 2010
21 commits
-
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] zcore: Fix reipl device detection
[S390] vdso: use ntp adjusted clock multiplier
[S390] cio: use exception-save stsch
[S390] add hook to reenable mss after hibernation
[S390] cio: allow enable_facility from outside init functions
[S390] dasd: fix endless loop in erp -
The reipl device information is passed from the kernel to zfcpdump
using a pointer in the lowcore (0xe00) that points to the reipl
information Currently if that pointer is not zero, we copy the reipl
information. If the pointer is not initialized and points outside
the accessible memory, it can happen that the memory copy fails.
In that case we currently stop the initialization of zcore which leads
to a failing kernel dump. The correct behavior is to disable the reipl
after dump and continue with zcore intialization.Signed-off-by: Michael Holzheu
Signed-off-by: Martin Schwidefsky -
Commit "timekeeping: Fix clock_gettime vsyscall time warp" (0696b711e)
introduced the new parameter "mult" to update_vsyscall(). This parameter
contains the internal NTP adjusted clock multiplier.The s390x vdso did not use this adjusted multiplier. Instead, it used
the constant clock multiplier for gettimeofday() and clock_gettime()
variants. This may result in observable time warps as explained in
commit 0696b711e.Make the NTP adjusted clock multiplier available to the s390x vdso
implementation and use it for time calculations.Cc:
Signed-off-by: Hendrik Brueckner
Signed-off-by: Martin Schwidefsky -
Using stsch on schids with ssid != 0 can lead to an operand
exception. Use stsch_err to handle potential exceptions
if we fail to reenable mss after hibernation.Cc:
Signed-off-by: Sebastian Ott
Signed-off-by: Martin Schwidefsky -
Reenable multiple subchannel sets after hibernation,
prior to the device callbacks.Cc:
Signed-off-by: Sebastian Ott
Signed-off-by: Martin Schwidefsky -
Prepare chsc_enable_facility to be used from outside init functions.
Use static memory for the chsc call and protect its access by a
spinlock (although there is no concurrent usage).Cc:
Signed-off-by: Sebastian Ott
Signed-off-by: Martin Schwidefsky -
If not enough memory is available to build a new erp request it ended
up in an endless loop trying to build erp requests. Fixed the loop to
proceed the next request instead.Signed-off-by: Stefan Haberland
Signed-off-by: Martin Schwidefsky -
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] bnx2i: Bug fixes related to MTU change issue when there are active iscsi sessions
[SCSI] ibmvscsi: fix DMA API misuse
[SCSI] wd7000: fix reset handler typo spin_unlock_irq() => spin_lock_irq()
[SCSI] zfcp: Fix tracing of requests with error status
[SCSI] zfcp: Update MAINTAINERS entry
[SCSI] iscsi_tcp: fix relogin/shutdown hang
[SCSI] qla2xxx: fix lock imbalance
[SCSI] lpfc: fix lock imbalances
[SCSI] be2iscsi: fix lock imbalance
[SCSI] dpt_i2o: several use after free issues -
The virtio balloon driver can dig into the reservation pools of the OS
to satisfy a balloon request. This is not advisable and other balloon
drivers (drivers/xen/balloon.c) avoid this as well.The patch also adds changes to avoid printing a warning if allocation
fails, since we retry after sometime anyway.Signed-off-by: Balbir Singh
Signed-off-by: Rusty Russell
Cc: kvm
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds -
* 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux:
i2c-stu300: off by one issue
i2c-pnx: Add stop conditions for end of transfer
i2c-pnx: Limit maximum divider to 1023
i2c-omap: fix OOPS in omap_i2c_unidle() during probe
i2c-imx: fix error handling -
When the dt3155 driver is built-in (not as a loadable module),
these build errors happen:drivers/staging/dt3155/dt3155_drv.c:1047: error: implicit declaration of function 'request_irq'
drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_SHARED' undeclared (first use in this function)
drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_DISABLED' undeclared (first use in this function)
drivers/staging/dt3155/dt3155_drv.c:1091: error: implicit declaration of function 'free_irq'so remove the #ifdef MODULE check since it's not needed. Also remove
the CONFIG_PCI check since the Kconfig file already requires that.Signed-off-by: Randy Dunlap
Cc: Scott Smedley
Tested-by: Jan III Sobieski
Signed-off-by: Linus Torvalds -
…s/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
security: testing the wrong variable in create_by_name()
CRED: Fix a race in creds_are_invalid() in credentials debugging
CRED: Fix double free in prepare_usermodehelper_creds() error handling -
There is a typo here. We should be testing "*dentry" instead of
"dentry". If "*dentry" is an ERR_PTR, it gets dereferenced in either
mkdir() or create() which would cause an OOPs.Signed-off-by: Dan Carpenter
Signed-off-by: James Morris -
creds_are_invalid() reads both cred->usage and cred->subscribers and then
compares them to make sure the number of processes subscribed to a cred struct
never exceeds the refcount of that cred struct.The problem is that this can cause a race with both copy_creds() and
exit_creds() as the two counters, whilst they are of atomic_t type, are only
atomic with respect to themselves, and not atomic with respect to each other.This means that if creds_are_invalid() can read the values on one CPU whilst
they're being modified on another CPU, and so can observe an evolving state in
which the subscribers count now is greater than the usage count a moment
before.Switching the order in which the counts are read cannot help, so the thing to
do is to remove that particular check.I had considered rechecking the values to see if they're in flux if the test
fails, but I can't guarantee they won't appear the same, even if they've
changed several times in the meantime.Note that this can only happen if CONFIG_DEBUG_CREDENTIALS is enabled.
The problem is only likely to occur with multithreaded programs, and can be
tested by the tst-eintr1 program from glibc's "make check". The symptoms look
like:CRED: Invalid credentials
CRED: At include/linux/cred.h:240
CRED: Specified credentials: ffff88003dda5878 [real][eff]
CRED: ->magic=43736564, put_addr=(null)
CRED: ->usage=766, subscr=766
CRED: ->*uid = { 0,0,0,0 }
CRED: ->*gid = { 0,0,0,0 }
CRED: ->security is ffff88003d72f538
CRED: ->security {359, 359}
------------[ cut here ]------------
kernel BUG at kernel/cred.c:850!
...
RIP: 0010:[] [] __invalid_creds+0x4e/0x52
...
Call Trace:
[] copy_creds+0x6b/0x23fNote the ->usage=766 and subscr=766. The values appear the same because
they've been re-read since the check was made.Reported-by: Roland McGrath
Signed-off-by: David Howells
Signed-off-by: James Morris -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: allow 4 coldfire serial ports
m68knommu: fix coldfire tcdrain
m68knommu: remove a duplicate vector setting line for 68360
Fix m68k-uclinux's rt_sigreturn trampoline
m68knommu: correct the CC flags for Coldfire M5272 targets
uclinux: error message when FLAT reloc symbol is invalid, v2 -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
mc13783-regulator: fix a memory leak in mc13783_regulator_remove
regulator: Let drivers know when they use the stub API -
* git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs:
[LogFS] Split large truncated into smaller chunks
[LogFS] Set s_bdi
[LogFS] Prevent mempool_destroy NULL pointer dereference
[LogFS] Move assertion
[LogFS] Plug 8 byte information leak
[LogFS] Prevent memory corruption on large deletes
[LogFS] Remove unused methodFix trivial conflict with added header includes in fs/logfs/super.c
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
jfs: add jfs specific ->setattr call
jfs: fix diAllocExt error in resizing filesystem
jfs_dmap.[ch]: trivial typo fix: s/heigth/height/g -
* 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: x86: Fix TSS size check for 16-bit tasks
KVM: Add missing srcu_read_lock() for kvm_mmu_notifier_release()
KVM: Increase NR_IOBUS_DEVS limit to 200
KVM: fix the handling of dirty bitmaps to avoid overflows
KVM: MMU: fix kvm_mmu_zap_page() and its calling path
KVM: VMX: Save/restore rflags.vm correctly in real mode
KVM: allow bit 10 to be cleared in MSR_IA32_MC4_CTL
KVM: Don't spam kernel log when injecting exceptions due to bad cr writes
KVM: SVM: Fix memory leaks that happen when svm_create_vcpu() fails
KVM: take srcu lock before call to complete_pio() -
* 'for-linus' of git://neil.brown.name/md:
md/raid5: allow for more than 2^31 chunks. -
In the error handling in afs_mntpt_do_automount(), we pass an error
pointer to page_cache_release() if read_mapping_page() failed. Instead,
we should extend the gotos around the error handling we don't need.Reported-by: Dan Carpenter
Signed-off-by: David Howells
Signed-off-by: Linus Torvalds
