13 Mar, 2010
40 commits
-
Some of the gitignore file patters were explicitly meant to be only for
the top level, but weren't marked that way, so they would trigger
recursively in subdirectories too. Normally that was harmless, but at
least "linux" happened to trigger elsewhere too. Fix it up.And other patterns in that section weren't necessarily top-level at all.
Reported-by: Jiri Slaby
Signed-off-by: Linus Torvalds -
…el/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
timekeeping: Prevent oops when GENERIC_TIME=n -
Inotify was switched to use anon_inode instead of its own private filesystem
which only had one inode in commit c44dcc56d2b5c7 "switch inotify_user to
anon_inode"The problem with this is that now the inotify inode is not a distinct inode
which can be managed by LSMs. userspace tools which use inotify were allowed
to use the inotify inode but may not have had permission to do read/write type
operations on the anon_inode. After looking at the anon_inode and its users
it looks like the best solution is to just mark the anon_inode as S_PRIVATE
so the security system will ignore it.Signed-off-by: Eric Paris
Acked-by: James Morris
Signed-off-by: Linus Torvalds -
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
udf: use ext2_find_next_bit
udf: Do not read inode before writing it
udf: Fix unalloc space handling in udf_update_inode -
* 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
msm_sdcc.c: missing brackets in msmsdcc_resume() -
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/booke: Fix breakpoint/watchpoint one-shot behavior
powerpc: Reduce printk from pseries_mach_cpu_die()
powerpc: Move checks in pseries_mach_cpu_die()
powerpc: Reset kernel stack on cpu online from cede state
powerpc: Fix G5 thermal shutdown
powerpc/pseries: Pass CPPR value to H_XIRR hcall
powerpc/booke: Fix a couple typos in the advanced ptrace code
powerpc: Fix SMP build with disabled CPU hotplugging.
powerpc: Dynamically allocate pacas
powerpc/perf: e500 support
powerpc/perf: Build callchain code regardless of hardware event support.
powerpc/cpm2: Checkpatch cleanup
powerpc/86xx: Renaming following split of GE Fanuc joint venture
powerpc/86xx: Convert gef_pic_lock to raw_spinlock
powerpc/qe: Convert qe_ic_lock to raw_spinlock
powerpc/82xx: Convert pci_pic_lock to raw_spinlock
powerpc/85xx: Convert socrates_fpga_pic_lock to raw_spinlock -
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits)
doc: fix typo in comment explaining rb_tree usage
Remove fs/ntfs/ChangeLog
doc: fix console doc typo
doc: cpuset: Update the cpuset flag file
Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed
Remove drivers/parport/ChangeLog
Remove drivers/char/ChangeLog
doc: typo - Table 1-2 should refer to "status", not "statm"
tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments
No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h
devres/irq: Fix devm_irq_match comment
Remove reference to kthread_create_on_cpu
tree-wide: Assorted spelling fixes
tree-wide: fix 'lenght' typo in comments and code
drm/kms: fix spelling in error message
doc: capitalization and other minor fixes in pnp doc
devres: typo fix s/dev/devm/
Remove redundant trailing semicolons from macros
fix typo "definetly" -> "definitely" in comment
tree-wide: s/widht/width/g typo in comments
...Fix trivial conflict in Documentation/laptops/00-INDEX
-
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (370 commits)
ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock
ARM: S3C2443: Remove #if 0 for clk_mpll
ARM: S3C2443: Update notes on MPLLREF clock
ARM: S3C2443: Further clksrc-clk conversions
ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation
USB: Fix s3c-hsotg build following Samsung platform header moves
ARM: S3C64XX: Reintroduce unconditional build of audio device
ARM: 5961/1: ux500: fix CLKRST addresses
ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted
ASoC: Fix S3C64xx IIS driver for Samsung header reorg
ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support
[ARM] pxa: fix typo in mxm8x10.h
[ARM] pxa/raumfeld: set GPIO drive bits for LED pins
[ARM] pxa/zeus: Add support for mcp2515 CAN bus
[ARM] pxa/zeus: Add support for onboard max6369 watchdog
[ARM] pxa/zeus: Add Eurotech as the manufacturer
[ARM] pxa/zeus: Correct the USB host initialisation flags
[ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress
[ARM] pxa: refactor uncompress.h for non-PXA uarts
[ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs
... -
Extern declarations in sysctl.c should be moved to their own header file,
and then include them in relavant .c files.Move epoll_table extern declaration to linux/poll.h
Signed-off-by: Dave Young
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Extern declarations in sysctl.c should be moved to their own header file,
and then include them in relavant .c files.Move lockdep extern declarations to linux/lockdep.h
Signed-off-by: Dave Young
Cc: Ingo Molnar
Cc: Peter Zijlstra
Cc: Thomas Gleixner
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Extern declarations in sysctl.c should be moved to their own header file,
and then include them in relavant .c files.Move max_lock_depth extern declaration to linux/rtmutex.h
Signed-off-by: Dave Young
Cc: Ingo Molnar
Cc: Peter Zijlstra
Cc: Thomas Gleixner
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Extern declarations in sysctl.c should be moved to their own header file,
and then include them in relavant .c files.Move acct_parm extern declaration to linux/acct.h
Signed-off-by: Dave Young
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Extern declarations in sysctl.c should be moved to their own header file,
and then include them in relavant .c files.Move sg_big_buff extern declaration to scsi/sg.h
Signed-off-by: Dave Young
Acked-by: Doug Gilbert
Cc: James Bottomley
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Extern declarations in sysctl.c should be moved to their own header file,
and then include them in relavant .c files.Move modprobe_path extern declaration to linux/kmod.h
Move modules_disabled extern declaration to linux/module.hSigned-off-by: Dave Young
Cc: Rusty Russell
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Extern declarations in sysctl.c should be moved to their own header file,
and then include them in relavant .c files.Move rcutorture_runnable extern declaration to linux/rcupdate.h
Signed-off-by: Dave Young
Acked-by: Josh Triplett
Reviewed-by: "Paul E. McKenney"
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Extern declarations in sysctl.c should be moved to their own header file,
and then include them in relavant .c files.Move print_fatal_signals extern declaration to linux/signal.h
Signed-off-by: Dave Young
Cc: Oleg Nesterov
Cc: Roland McGrath
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Extern declarations in sysctl.c should be moved to their own header file,
and then include them in relavant .c files.Move C_A_D extern variable declaration to linux/reboot.h
Signed-off-by: Dave Young
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
This unpleasant typo appeared while porting the driver from Freescale
original sources, where anyone can easily find the correct version.Current incorrect version potentially can influence segment and merge
handling in block subsystem via MMC request queue settings.Signed-off-by: Vladimir Zapolskiy
Cc: Sascha Hauer
Cc: Pierre Ossman
Cc:
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
inflate_fast() can do either POST INC or PRE INC on its pointers walking
the memory to decompress. Default is PRE INC.The sout pointer offset was miscalculated in one case as the calculation
assumed sout was a char * This breaks inflate_fast() iff configured to do
POST INC.Signed-off-by: Joakim Tjernlund
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Commit 6846ee5ca68d81e6baccf0d56221d7a00c1be18b ("zlib: Fix build of
powerpc boot wrapper") made the new optimized inflate only available on
arch's that define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS.This patch will again enable the optimization for all arch's by defining
our own endian independent version of unaligned access. As an added
bonus, arch's that define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS do a
plain load instead.Signed-off-by: Joakim Tjernlund
Cc: Anton Blanchard
Cc: Benjamin Herrenschmidt
Cc: David Woodhouse
Cc: Kumar Gala
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
The ARM kernel decompressor wants to be able to relocate r/w data
independently from the rest of the image, and we do this by ensuring that
r/w data has global visibility. Define STATIC_RW_DATA to be empty to
achieve this.Signed-off-by: Russell King
Cc: Alain Knaff
Cc:
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Replace open-coded loop with for_each_set_bit().
Signed-off-by: Akinobu Mita
Cc: Jack Steiner
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
The variable x is initialized twice to the same (side effect-free)
expression. Drop one initialization.A simplified version of the semantic match that finds this problem is:
(http://coccinelle.lip6.fr/)//
@forall@
idexpression *x;
identifier f!=ERR_PTR;
@@x = f(...)
... when != x
(
x = f(...,,...)
|
* x = f(...)
)
//Stefan observed:
The next x = rb_entry(mn->next, struct mmtimer, list); is preceded by a
test whether mn->next is NULL.Unless that test is redundant too, your patch fixes a potential NULL
pointer dereference, introduced by commit cbacdd95 "SGI Altix mmtimer:
allow larger number of timers per node" in 2.6.26.Signed-off-by: Julia Lawall
Cc: Stefan Richter
Cc: Dimitri Sivanich
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
This fixes the section mismatch warning for mxc_w1_probe()
Cc: Evgeniy Polyakov
Cc: Sascha Hauer
Acked-by: Uwe Kleine-König
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
With `while (++retries < DS2482_WAIT_IDLE_TIMEOUT)' retries reaches
DS2482_WAIT_IDLE_TIMEOUT after the loopSigned-off-by: Roel Kluin
Cc: Evgeniy Polyakov
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Function pl010_enable_ms() is automagically called when PPS ldisc
is selected.Signed-off-by: Rodolfo Giometti
Cc: David Woodhouse
Cc: Greg KH
Cc: Alan Cox
Cc: Alexander Gordeev
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Automagically function serial8250_enable_ms() is called when PPS ldisc
is selected.Signed-off-by: Rodolfo Giometti
Cc: David Woodhouse
Cc: Greg KH
Cc: Alan Cox
Cc: Alexander Gordeev
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Adds support, by using the PPS line discipline, for the PPS sources
connected with the CD (Carrier Detect) pin of a serial port.[akpm@linux-foundation.org: fix cast size warnings]
Signed-off-by: Rodolfo Giometti
Cc: David Woodhouse
Cc: Greg KH
Cc: Alan Cox
Cc: Alexander Gordeev
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
This new method can be used to init a new struct tty_ldisc_ops as the
default tty_ldisc_N_TTY struct.Signed-off-by: Rodolfo Giometti
Cc: David Woodhouse
Cc: Greg KH
Cc: Alan Cox
Cc: Alexander Gordeev
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Signed-off-by: Rodolfo Giometti
Cc: David Woodhouse
Cc: Greg KH
Cc: Alan Cox
Cc: Alexander Gordeev
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Each PPS source can be registered/deregistered into the system by using
special modules called "clients". They simply define the PPS sources'
attributes and implement the time signal registration mechanism.This patch adds a special directory for such clients and adds a dummy
client that can be useful to test system integrity on real systems.[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Rodolfo Giometti
Cc: David Woodhouse
Cc: Greg KH
Cc: Alan Cox
Cc: Alexander Gordeev
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
Signed-off-by: FUJITA Tomonori
Cc: James Bottomley
Cc: "David S. Miller"
Cc: Randy Dunlap
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
- remove the PCI DMA API description in DMA-API.txt
- remove the descriptions of dma_unmap macros since
PCI-DMA-mapping.txt has the same description.Signed-off-by: FUJITA Tomonori
Cc: James Bottomley
Cc: "David S. Miller"
Reviewed-by: Randy Dunlap
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
- replace the PCI DMA API (i.e. pci_dma_*) with the generic DMA API.
- make the document more generic (use the PCI specific explanation as
an example).[akpm@linux-foundation.org: fix things Randy noticed]
Signed-off-by: FUJITA Tomonori
Cc: James Bottomley
Cc: "David S. Miller"
Reviewed-by: Randy Dunlap
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
We can use pci-dma-compat.h to implement pci_set_dma_mask and
pci_set_consistent_dma_mask as we do with the other PCI DMA API.We can remove HAVE_ARCH_PCI_SET_DMA_MASK too.
Signed-off-by: FUJITA Tomonori
Cc: Jesse Barnes
Cc: Greg KH
Cc: Kay Sievers
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
This converts arm to the generic pci_set_dma_mask and
pci_set_consistent_dma_mask (removes HAVE_ARCH_PCI_SET_DMA_MASK for
dmabounce).Signed-off-by: FUJITA Tomonori
Looked-over-by: Russell King
Cc: Jesse Barnes
Cc: Greg KH
Cc: Kay Sievers
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
This converts powerpc to use the generic pci_set_dma_mask and
pci_set_consistent_dma_mask (drivers/pci/pci.c).The generic pci_set_dma_mask does what powerpc's pci_set_dma_mask does.
Unlike powerpc's pci_set_consistent_dma_mask, the gneric
pci_set_consistent_dma_mask sets only coherent_dma_mask. It doesn't work
for powerpc? pci_set_consistent_dma_mask API should set only
coherent_dma_mask?Signed-off-by: FUJITA Tomonori
Acked-by: Benjamin Herrenschmidt
Cc: Jesse Barnes
Cc: Greg KH
Cc: Kay Sievers
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
dma_set_coherent_mask corresponds to pci_set_consistent_dma_mask. This is
necessary to move to the generic device model DMA API from the PCI bus
specific API in the long term.dma_set_coherent_mask works in the exact same way that
pci_set_consistent_dma_mask does. So this patch also changes
pci_set_consistent_dma_mask to call dma_set_coherent_mask.Signed-off-by: FUJITA Tomonori
Cc: James Bottomley
Cc: David S. Miller
Cc: Jesse Barnes
Cc: Benjamin Herrenschmidt
Cc: Russell King
Cc: Greg KH
Cc: Kay Sievers
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
This changes pci_set_dma_mask to call the generic DMA API, dma_set_mask.
pci_set_dma_mask (in drivers/pci/pci.c) does the same things that
dma_set_mask does on all the architectures that use pci_set_dma_mask;
calls dma_supprted and sets dev->dma_mask. So we safely change
pci_set_dma_mask to simply call dma_set_mask.Signed-off-by: FUJITA Tomonori
Cc: James Bottomley
Cc: David S. Miller
Cc: Jesse Barnes
Acked-by: Benjamin Herrenschmidt
Cc: Russell King
Cc: Greg KH
Cc: Kay Sievers
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds -
This converts Alpha to use include/linux/pci-dma-compat.h. Alpha is the
only architecutre that implements the PCI DMA API in the own way. That
makes it difficult to implement the generic DMA API via the PCI bus
specific DMA API.The generic DMA API calls the PCI DMA API implementation in
arch/alpha/kernel/pci_iommu.c on non Jensen systems. It calls the DMA API
in arch/alpha/kernel/pci-noop.c on Jensen systems.Signed-off-by: FUJITA Tomonori
Cc: Richard Henderson
Cc: Ivan Kokshaysky
Cc: Matt Turner
Cc: Jesse Barnes
Cc: Greg KH
Cc: Kay Sievers
Signed-off-by: Andrew Morton
Signed-off-by: Linus Torvalds
