03 Apr, 2009
2 commits
-
Pass the original flags to rwlock arch-code, so that it can re-enable
interrupts if implemented for that architecture.Initially, make __raw_read_lock_flags and __raw_write_lock_flags stubs
which just do the same thing as non-flags variants.Signed-off-by: Petr Tesarik
Signed-off-by: Robin Holt
Acked-by: Peter Zijlstra
Cc:
Acked-by: Ingo Molnar
Cc: "Luck, Tony"
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
First argument unused since 2.3.11.
[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Alexey Dobriyan
Cc:
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
01 Apr, 2009
2 commits
-
Signed-off-by: dann frazier
Cc: Alessandro Zummo
Cc: Kyle McMartin
Cc: Grant Grundler
Cc: Matthew Wilcox
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Signed-off-by: dann frazier
Cc: Alessandro Zummo
Cc: Kyle McMartin
Cc: Grant Grundler
Cc: Matthew Wilcox
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
28 Mar, 2009
4 commits
-
Conflicts:
arch/sparc/kernel/time_64.c
drivers/gpu/drm/drm_proc.cManual merge to resolve build warning due to phys_addr_t type change
on x86:drivers/gpu/drm/drm_info.c
Signed-off-by: Ingo Molnar
-
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (37 commits)
fs: avoid I_NEW inodes
Merge code for single and multiple-instance mounts
Remove get_init_pts_sb()
Move common mknod_ptmx() calls into caller
Parse mount options just once and copy them to super block
Unroll essentials of do_remount_sb() into devpts
vfs: simple_set_mnt() should return void
fs: move bdev code out of buffer.c
constify dentry_operations: rest
constify dentry_operations: configfs
constify dentry_operations: sysfs
constify dentry_operations: JFS
constify dentry_operations: OCFS2
constify dentry_operations: GFS2
constify dentry_operations: FAT
constify dentry_operations: FUSE
constify dentry_operations: procfs
constify dentry_operations: ecryptfs
constify dentry_operations: CIFS
constify dentry_operations: AFS
... -
Due to a different size of ino_t ustat needs a compat handler, but
currently only x86 and mips provide one. Add a generic compat_sys_ustat
and switch all architectures over to it. Instead of doing various
user copy hacks compat_sys_ustat just reimplements sys_ustat as
it's trivial. This was suggested by Arnd Bergmann.Found by Eric Sandeen when running xfstests/017 on ppc64, which causes
stack smashing warnings on RHEL/Fedora due to the too large amount of
data writen by the syscall.Signed-off-by: Christoph Hellwig
Signed-off-by: Al Viro -
Conflicts:
arch/parisc/kernel/irq.c
arch/x86/include/asm/fixmap_64.h
arch/x86/include/asm/setup.h
kernel/irq/handle.cSemantic merge:
arch/x86/include/asm/fixmap.hSigned-off-by: Ingo Molnar
27 Mar, 2009
4 commits
-
…el/git/tip/linux-2.6-tip
* 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits)
x86: headers cleanup - setup.h
emu101k1.h: fix duplicate include of <linux/types.h>
compiler-gcc4: conditionalize #error on __KERNEL__
remove __KERNEL_STRICT_NAMES
make netfilter use strict integer types
make drm headers use strict integer types
make MTD headers use strict integer types
make most exported headers use strict integer types
make exported headers use strict posix types
unconditionally include asm/types.h from linux/types.h
make linux/types.h as assembly safe
Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h
headers_check fix cleanup: linux/reiserfs_fs.h
headers_check fix cleanup: linux/nubus.h
headers_check fix cleanup: linux/coda_psdev.h
headers_check fix: x86, setup.h
headers_check fix: x86, prctl.h
headers_check fix: linux/reinserfs_fs.h
headers_check fix: linux/socket.h
headers_check fix: linux/nubus.h
...Manually fix trivial conflicts in:
include/linux/netfilter/xt_limit.h
include/linux/netfilter/xt_statistic.h -
* 'irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (32 commits)
x86: disable __do_IRQ support
sparseirq, powerpc/cell: fix unused variable warning in interrupt.c
genirq: deprecate obsolete typedefs and defines
genirq: deprecate __do_IRQ
genirq: add doc to struct irqaction
genirq: use kzalloc instead of explicit zero initialization
genirq: make irqreturn_t an enum
genirq: remove redundant if condition
genirq: remove unused hw_irq_controller typedef
irq: export remove_irq() and setup_irq() symbols
irq: match remove_irq() args with setup_irq()
irq: add remove_irq() for freeing of setup_irq() irqs
genirq: assert that irq handlers are indeed running in hardirq context
irq: name 'p' variables a bit better
irq: further clean up the free_irq() code flow
irq: refactor and clean up the free_irq() code flow
irq: clean up manage.c
irq: use GFP_KERNEL for action allocation in request_irq()
kernel/irq: fix sparse warning: make symbol static
irq: optimize init_kstat_irqs/init_copy_kstat_irqs
... -
Conflicts:
drivers/net/wimax/i2400m/usb-notif.c
16 Mar, 2009
1 commit
13 Mar, 2009
12 commits
-
Signed-off-by: Kyle McMartin
-
Bloody inconsiderate driver writers...
Signed-off-by: Kyle McMartin
-
cpumask arg to the affinity function is now const, sort
that out through the irq_desc implementations.Signed-off-by: Kyle McMartin
-
Kills the 'value computed but not used' due to
leX_to_cpu.Signed-off-by: Kyle McMartin
-
cpumask api needs to take a pointer to irq_desc[cpu].affinity
Signed-off-by: Kyle McMartin
-
Impact: cleanup, update to new cpumask API
Irq_desc.affinity and irq_desc.pending_mask are now cpumask_var_t's
so access to them should be using the new cpumask API.Signed-off-by: Mike Travis
Signed-off-by: Kyle McMartin -
Signed-off-by: Helge Deller
Signed-off-by: Kyle McMartin -
Add braces around the macro arguments, else for example
"shl %r1, 5-3, %r2" would not expand to what you would assume.Signed-off-by: Helge Deller
Signed-off-by: Kyle McMartin -
Signed-off-by: Helge Deller
Signed-off-by: Kyle McMartin -
Fix those compile warnings:
uaccess.h:244: warning: `struct pt_regs' declared inside parameter list
uaccess.h:244: warning: its scope is only this definition or declaration, which is probably not what you wantSigned-off-by: Helge Deller
Signed-off-by: Kyle McMartin -
Signed-off-by: Helge Deller
Signed-off-by: Kyle McMartin -
- convert a few "if (xx) BUG();" to BUG_ON(xx)
- remove a few printk()s, as we get a backtrace with BUG_ON() anywaySigned-off-by: Helge Deller
Signed-off-by: Kyle McMartin
16 Feb, 2009
1 commit
-
User space can request hardware and/or software time stamping.
Reporting of the result(s) via a new control message is enabled
separately for each field in the message because some of the
fields may require additional computation and thus cause overhead.
User space can tell the different kinds of time stamps apart
and choose what suits its needs.When a TX timestamp operation is requested, the TX skb will be cloned
and the clone will be time stamped (in hardware or software) and added
to the socket error queue of the skb, if the skb has a socket
associated with it.The actual TX timestamp will reach userspace as a RX timestamp on the
cloned packet. If timestamping is requested and no timestamping is
done in the device driver (potentially this may use hardware
timestamping), it will be done in software after the device's
start_hard_xmit routine.Signed-off-by: Patrick Ohly
Signed-off-by: David S. Miller
14 Feb, 2009
1 commit
-
Conflicts:
arch/x86/include/asm/setup.h
13 Feb, 2009
1 commit
06 Feb, 2009
1 commit
-
Conflicts:
arch/x86/mach-default/setup.cSemantic merge:
arch/x86/kernel/irqinit_32.cSigned-off-by: Ingo Molnar
01 Feb, 2009
2 commits
-
fix the following 'make headers_check' warnings:
usr/include/asm-parisc/swab.h:4: include of is preferred over
usr/include/asm-parisc/swab.h:9: found __[us]{8,16,32,64} type without #includeSigned-off-by: Jaswinder Singh Rajput
-
fix the following 'make headers_check' warning:
usr/include/asm-parisc/pdc.h:420: found __[us]{8,16,32,64} type without #include
Signed-off-by: Jaswinder Singh Rajput
30 Jan, 2009
1 commit
-
Move DMA-mapping.txt to Documentation/PCI/.
DMA-mapping.txt was supposed to be moved from Documentation/ to
Documentation/PCI/. The 00-INDEX files in those two directories
were updated, along with a few other text files, but the file
itself somehow escaped being moved, so move it and update more
text files and source files with its new location.Signed-off-by: Randy Dunlap
Acked-by: Greg Kroah-Hartman
cc: Jesse Barnes
Signed-off-by: Linus Torvalds
21 Jan, 2009
1 commit
-
Conflicts:
arch/x86/mm/fault.c
15 Jan, 2009
1 commit
-
Add swab.h to kbuild.asm and remove the individual entries from
each arch, mark as unifdef as some arches have some kernel-only
bits inside.Signed-off-by: Harvey Harrison
Signed-off-by: Linus Torvalds
13 Jan, 2009
1 commit
-
Impact: cleanup, update to new cpumask API
Irq_desc.affinity and irq_desc.pending_mask are now cpumask_var_t's
so access to them should be using the new cpumask API.Signed-off-by: Mike Travis
11 Jan, 2009
1 commit
-
Impact: build fix
Ingo Molnar wrote:
> tip/arch/blackfin/kernel/irqchip.c: In function 'show_interrupts':
> tip/arch/blackfin/kernel/irqchip.c:85: error: 'struct kernel_stat' has no member named 'irqs'
> make[2]: *** [arch/blackfin/kernel/irqchip.o] Error 1
> make[2]: *** Waiting for unfinished jobs....
>So could move kstat_irqs array to irq_desc struct.
(s390, m68k, sparc) are not touched yet, because they don't support genirq
Signed-off-by: Yinghai Lu
Signed-off-by: Ingo Molnar
10 Jan, 2009
2 commits
-
Fix for the linux/byteorder.h removal.
Signed-off-by: Harvey Harrison
Signed-off-by: Linus Torvalds -
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: export length of os_hpmc vector
parisc: fix kernel crash (protection id trap) when compiling ruby1.9
parisc: Use DEFINE_SPINLOCK
parisc: add uevent helper for parisc bus
parisc: fix ipv6 checksum
parisc: quiet palo not-found message from "which"
parisc: Replace NR_CPUS in parisc code
parisc: trivial fixes
parisc: fix braino in commit adding __space_to_prot
parisc: factor out sid to protid conversion
parisc: use leX_to_cpu in place of __fswabX
parisc: fix GFP_KERNEL use while atomic in unwinder
parisc: remove dead BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions
parisc: set_time() catch errors
parisc: use the new byteorder headers
parisc: drivers/parisc/: make code static
parisc: lib/: make code static
07 Jan, 2009
1 commit
-
The atomic_t type cannot currently be used in some header files because it
would create an include loop with asm/atomic.h. Move the type definition
to linux/types.h to break the loop.Signed-off-by: Matthew Wilcox
Cc: Huang Ying
Cc:
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
06 Jan, 2009
1 commit
-
and use this instead of dealing with exporting start/end and
toying with function descriptors.Signed-off-by: Kyle McMartin
