summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-08-11m68k{,nommu}: Wire up new system callsGeert Uytterhoeven
Wire up for m68k{,nommu} the system calls that were added in the last merge window: - 4006553b06306b34054529477b06b68a1c66249b ("flag parameters: inotify_init") - ed8cae8ba01348bfd83333f4648dd807b04d7f08 ("flag parameters: pipe") - 336dd1f70ff62d7dd8655228caed4c5bfc818c56 ("flag parameters: dup2") - a0998b50c3f0b8fdd265c63e0032f86ebe377dbf ("flag parameters: epoll_create") - 9fe5ad9c8cef9ad5873d8ee55d1cf00d9b607df0 ("flag parameters add-on: remove epoll_create size param") - b087498eb5605673b0f260a7620d91818cd72304 ("flag parameters: eventfd") - 9deb27baedb79759c3ab9435a7d8b841842d56e9 ("flag parameters: signalfd") Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-08-11Revert "fbcon: bgcolor fix"Linus Torvalds
This reverts commit 2d04a4a72d7e1519b4838f24bdd4b5d0f3f426dc, which made it impossible to make the softcursor use the highlight colors. Yes, the fourth bit should be "blinking", but since we cannot reasonably blink in fbcon, highlighting it with a bright background is preferable. Reported-by: Pavel Machek <pavel@suse.cz> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Krzysztof Helt <krzysztof.h1@poczta.fm> Cc: Antonino A. Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-08-09Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: SLUB: dynamic per-cache MIN_PARTIAL mm: unexport ksize
2008-08-09uninline atl1e_setup_mac_ctrl()Adrian Bunk
There doesn't seem to be a compelling reason why atl1e_setup_mac_ctrl() is marked as "inline": It's not used in any place where speed would matter much, and as long as it has only one caller non-ancient gcc versions anyway inline it automatically. This patch fixes the following compile error with gcc 3.4: CC drivers/net/atl1e/atl1e_main.o atl1e_main.c: In function `atl1e_check_link': atl1e_main.c:50: sorry, unimplemented: inlining failed in call to atl1e_main.c:196: sorry, unimplemented: called from here Reported-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-08-09Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6Linus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6: avr32: Make atstk1006_nand_data definition static avr32: Reduce DataFlash bus speed to 8 MHz on ATNGW100 avr32: Update defconfigs avr32: Clean up HMATRIX code avr32: Add MMIO address definitions for certain controllers avr32: Introduce <mach/chip.h> avr32: Remove include/asm-avr32/arch-at32ap
2008-08-08Merge branch 'fixes' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ][2/2] preregister support for powernow-k8 [CPUFREQ][1/2] whitespace fix for powernow-k8 [CPUFREQ] Update MAINTAINERS to reflect new mailing list. [CPUFREQ] Fix warning in elanfreq [CPUFREQ] Fix -Wshadow warning in conservative governor. [CPUFREQ] Remove EXPERIMENTAL annotation from VIA C7 powersaver kconfig.
2008-08-08Merge branch 'master' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: [CIFS] list entry can not return null turn cifs_setattr into a multiplexor that calls the correct function move file time and dos attribute setting logic into new function spin off cifs_setattr with unix extensions to its own function [CIFS] Code cleanup in old sessionsetup code [CIFS] cifs_mkdir and cifs_create should respect the setgid bit on parent dir Rename CIFSSMBSetFileTimes to CIFSSMBSetFileInfo and add PID arg change CIFSSMBSetTimes to CIFSSMBSetPathInfo [CIFS] fix trailing whitespace bundle up Unix SET_PATH_INFO args into a struct and change name Fix missing braces in cifs_revalidate() remove locking around tcpSesAllocCount atomic variable [CIFS] properly account for new user= field in SPNEGO upcall string allocation [CIFS] remove level of indentation from decode_negTokenInit [CIFS] cifs send2 not retrying enough in some cases on full socket [CIFS] oid should also be checked against class in cifs asn
2008-08-08list.h: fix fatal kernel-doc errorRandy Dunlap
Fix fatal multi-line kernel-doc error in list.h: function short description must be on one line. Error(linux-2.6.27-rc2-git3//include/linux/list.h:318): duplicate section name 'Description' Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-08-08[CIFS] list entry can not return nullSteve French
Signed-off-by: Steve French <sfrench@us.ibm.com>
2008-08-08[CPUFREQ][2/2] preregister support for powernow-k8Mark Langsdorf
This patch provides support for the _PSD ACPI object in the Powernow-k8 driver. Although it looks like an invasive patch, most of it is simply the consequence of turning the static acpi_performance_data structure into a pointer. AMD has tested it on several machines over the past few days without issue. [trivial checkpatch warnings fixed up by davej] [X86_POWERNOW_K8_ACPI=n buildfix from Randy Dunlap] Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com> Tested-by: Frank Arnold <frank.arnold@amd.com> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Dave Jones <davej@redhat.com>
2008-08-08[CPUFREQ][1/2] whitespace fix for powernow-k8Mark Langsdorf
Trivial whitespace fix for powernow-k8. Signed-off-by: Mark Langsdorf <mark.langsdorf@amd.com> Signed-off-by: Dave Jones <davej@redhat.com>
2008-08-08[CPUFREQ] Update MAINTAINERS to reflect new mailing list.Dave Jones
Mailing list moved to vger. Signed-off-by: Dave Jones <davej@redhat.com>
2008-08-08[CPUFREQ] Fix warning in elanfreqDave Jones
arch/x86/kernel/cpu/cpufreq/elanfreq.c:47:26: warning: symbol 'elan_multiplier' was not declared. Should it be static? Yes, yes it should. Signed-off-by: Dave Jones <davej@redhat.com>
2008-08-08[CPUFREQ] Fix -Wshadow warning in conservative governor.Dave Jones
drivers/cpufreq/cpufreq_conservative.c:336:15: warning: symbol 'freq_step' shadows an earlier one Just rename the local variable. Signed-off-by: Dave Jones <davej@redhat.com>
2008-08-08[CPUFREQ] Remove EXPERIMENTAL annotation from VIA C7 powersaver kconfig.Dave Jones
This has been pretty solid, and doesn't see much change at all. Noticed by Harald Welte. Signed-off-by: Dave Jones <davej@redhat.com>
2008-08-08Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds
* 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB [ARM] 5166/1: magician: add MAINTAINERS entry [ARM] fix pnx4008 build errors [ARM] Fix SMP booting with non-zero PHYS_OFFSET [ARM] 5185/1: Fix spi num_chipselect for lubbock [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach [ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include [ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead [ARM] Eliminate useless includes of asm/mach-types.h [ARM] Fix circular include dependency with IRQ headers avr32: Use <mach/foo.h> instead of <asm/arch/foo.h> avr32: Introduce arch/avr32/mach-*/include/mach avr32: Move include/asm-avr32 to arch/avr32/include/asm [ARM] sa1100_wdt: use reset_status to remember watchdog reset status [ARM] pxa: introduce reset_status and clear_reset_status for driver's usage [ARM] pxa: introduce reset.h for reset specific header information
2008-08-08[NFSD] uninline nfsd4_op_name()Adrian Bunk
There doesn't seem to be a compelling reason why nfsd4_op_name() is marked as "inline": It's only used in a dprintk(), and as long as it has only one caller non-ancient gcc versions anyway inline it automatically. This patch fixes the following compile error with gcc 3.4: ... CC fs/nfsd/nfs4proc.o nfs4proc.c: In function `nfsd4_proc_compound': nfs4proc.c:854: sorry, unimplemented: inlining failed in call to nfs4proc.c:897: sorry, unimplemented: called from here make[3]: *** [fs/nfsd/nfs4proc.o] Error 1 Reported-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Adrian Bunk <bunk@kernel.org> [ Also made it "const char *" - Linus] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-08-08Merge Linus' latest into masterRussell King
Conflicts: drivers/watchdog/at91rm9200_wdt.c drivers/watchdog/davinci_wdt.c drivers/watchdog/ep93xx_wdt.c drivers/watchdog/ixp2000_wdt.c drivers/watchdog/ixp4xx_wdt.c drivers/watchdog/ks8695_wdt.c drivers/watchdog/omap_wdt.c drivers/watchdog/pnx4008_wdt.c drivers/watchdog/sa1100_wdt.c drivers/watchdog/wdt285.c
2008-08-08Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (99 commits) pkt_sched: Fix actions referencing bnx2x: fix logical op tcp: (whitespace only) fix confusing indentation pkt_sched: Fix qdisc config when link is down. [Bluetooth] Add full quirk implementation for btusb driver [Bluetooth] Removal of unnecessary ignore module parameter [Bluetooth] Add parameters to control BNEP header compression ath9k: Revamp wireless mode usage ath9k: More unused macros ath9k: Remove a few unused macros and fix indentation ath9k: Use mac80211's band macros and remove enum hal_freq_band ath9k: Remove redundant data structure ath9k_txq_info ath9k: Cleanup data structures related to HW capabilities ath9k: work around gcc ICEs ath9k: Add new Atheros IEEE 802.11n driver ath5k: remove Atheros 11n devices from supported list list.h: add list_cut_position() list.h: Add list_splice_tail() and list_splice_tail_init() p54: swap short slot time dcf values rt2x00: Block all unsupported modes ...
2008-08-08Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Fix end-of-stack checking in save_stack_trace(). sparc: don't use asm/of_device.h sparc64: Use kernel/uid16.c helpers instead of own copy. of/sparc: remove include of linux/of_platform.h from asm/of_platform.h sparc: i8042-sparcio.h: fix warning
2008-08-08powerpc: Do not ignore arch/powerpc/includeJunio C Hamano
Back when .gitignore file was added to arch/powerpc/ in 06f2138 ([POWERPC] Add files build to .gitignore, 2006-11-26), there indeed was nothing tracked in the ignored hierarchy and ignoring everything made sense. But we have very many tracked files there these days, and having a higher level .gitignore that ignores everything is asking for future troubles.. This should have been part of b8b572e (powerpc: Move include files to arch/powerpc/include/asm, 2008-08-01). Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-08-08[ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USBAdrian Bunk
This patch removes the commented out line for the not available CONFIG_SA1100_USB option. Reported-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-08-08[ARM] 5166/1: magician: add MAINTAINERS entryPhilipp Zabel
Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com> Acked-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-08-08[ARM] fix pnx4008 build errorsRussell King
include/linux/i2c-pnx.h was missed when moving the include files. Fix it now; it doesn't really need to include mach/i2c.h at all. Successfully build tested with pnx4008_defconfig, which had failed in linux-next. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2008-08-08avr32: Make atstk1006_nand_data definition staticHaavard Skinnemoen
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
2008-08-08avr32: Reduce DataFlash bus speed to 8 MHz on ATNGW100Haavard Skinnemoen
Doing this in combination with "atmel_spi: fix hang due to missed interrupt" appears to eliminate the overruns I'm seeing when using JFFS2-on-DataFlash as /usr filesystem on the ATNGW100. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
2008-08-08avr32: Update defconfigsHaavard Skinnemoen
Enable power management, DMA and MMC on all boards except ATSTK1004, and add defconfig for the new ATSTK1006 board with NAND flash, UBI and UBIFS enabled as well. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
2008-08-08avr32: Clean up HMATRIX codeHaavard Skinnemoen
Introduce a few helper functions for HMATRIX configuration and clean up the register definitions. Also add definitions for the HMATRIX master and slave IDs on the AT32AP700x chips. Also make the definitions in hmatrix.h available to board code by moving it to <mach/hmatrix.h> Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
2008-08-08avr32: Add MMIO address definitions for certain controllersHaavard Skinnemoen
Hardcoded MMIO base addresses are used a few places throughout the platform code. Move these into the chip-specific header file so that adding support for new chips becomes a bit easier. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
2008-08-08avr32: Introduce <mach/chip.h>Haavard Skinnemoen
This file includes the appropriate chip-specific header with MMIO, IRQ and GPIO definitions used by the platform code. It may also be used to provide inline GPIO accessors for drivers that are willing to sacrifice portability for faster bitbanging. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
2008-08-08avr32: Remove include/asm-avr32/arch-at32apHaavard Skinnemoen
Since all users have been converted over to use <mach/foo.h>, there's no need for the arch-at32ap directory and associated symlink anymore. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
2008-08-07sparc64: Fix end-of-stack checking in save_stack_trace().David S. Miller
Bug reported by Alexander Beregalov. Before we dereference the stack frame or try to peek at the pt_regs magic value, make sure the entire object is within the kernel stack bounds. Signed-off-by: David S. Miller <davem@davemloft.net>
2008-08-07pkt_sched: Fix actions referencingJamal Hadi Salim
When an action is added several times with the same exact index it gets deleted on every even-numbered attempt. This fixes that issue. Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: David S. Miller <davem@davemloft.net>
2008-08-07bnx2x: fix logical opRandy Dunlap
Fix dubious logical operation that was found by sparse: linux-next-20080807/drivers/net/bnx2x_main.c:7205:27: warning: dubious: !x & y Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2008-08-07Merge branch 'master' of ↵David S. Miller
git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
2008-08-07tcp: (whitespace only) fix confusing indentationAdam Langley
The indentation in part of tcp_minisocks makes it look like one of the if statements is much more important than it actually is. Signed-off-by: Adam Langley <agl@imperialviolet.org> Signed-off-by: David S. Miller <davem@davemloft.net>
2008-08-07pkt_sched: Fix qdisc config when link is down.David S. Miller
Bug reported by Stephen Hemminger. We need to fetch the root from ->qdisc_sleeping not ->qdisc. Signed-off-by: David S. Miller <davem@davemloft.net>
2008-08-07Merge branch 'ath9k' of ↵David S. Miller
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
2008-08-07Merge branch 'tracehook' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace * 'tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace: tracehook: fix CLONE_PTRACE
2008-08-07Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/mad: Test ib_create_send_mad() return with IS_ERR(), not == NULL IB/mlx4: Allow 4K messages for UD QPs mlx4_core: Add ethernet fields to CQE struct IB/ipath: Fix printk format warnings RDMA/cxgb3: Fix deadlock initializing iw_cxgb3 device RDMA/cxgb3: Fix up MW access rights RDMA/cxgb3: Fix QP capabilities RDMA/cma: Remove padding arrays by using struct sockaddr_storage IB/ipath: Use unsigned long for irq flags IPoIB/cm: Set correct SG list in ipoib_cm_init_rx_wr()
2008-08-07Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds
* 'for-linus' of git://git.kernel.dk/linux-2.6-block: xen-blkfront.c: make blkif_ioctl() static bio: make use of bvec_nr_vecs cciss: fix bug if scsi tape support is disabled cciss: add support for multi lun tape devices cciss: change the way we notify scsi midlayer of tape drives cciss: fix negative logical drive count in procfs cciss: remove redundant code cciss: make rebuild_lun_table behave better cciss: return -EFAULT if copy_from_user() fails
2008-08-07Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ASoC: fix SNDCTL_DSP_SYNC support in Freescale 8610 sound drivers
2008-08-07Fix up duplicate '__s3c2410wdt_stop()' functionLinus Torvalds
Looks like somebody didn't get enough sleep. Noticed-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-08-07Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: Move all of include/asm-m68knommu to arch/m68knommu/include/asm.
2008-08-07powerpc/iseries: remove the old viocons driverStephen Rothwell
This driver was declared obsolete over 2 years ago, the alternative console driver for legacy iSeries (hvc_iseries) was made the default over 1 year ago and this driver has been build broken for over 3 months, so remove it. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-08-07Merge branch 'for_linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: (23 commits) V4L/DVB (8617): uvcvideo: don't use stack-based buffers for USB transfers. V4L/DVB (8616): uvcvideo: Add support for two Bison Electronics webcams V4L/DVB (8611): Add suspend/resume to pxa_camera driver V4L/DVB (8610): Add suspend/resume capabilities to soc_camera. V4L/DVB (8609): media: Clean up platform_driver_unregister() bogosity. V4L/DVB (8607): cxusb: fix OOPS and broken tuning regression on FusionHDTV Dual Digital 4 V4L/DVB (8605): gspca: Fix of gspca_zc3xx oops - 2.6.27-rc1 V4L/DVB (8604): gspca: Fix of "scheduling while atomic" crash. V4L/DVB (8602): gspca: Fix small bugs, simplify and cleanup ov519. V4L/DVB (8582): set mts_firmware for em2882 based Pinnacle Hybrid Pro V4L/DVB (8574): gspca: Bad bytesperlines of pixelformat in spca505/506/508 and vc023x. V4L/DVB (8573): gspca: Bad scan of frame in spca505/506/508. V4L/DVB (8572): gspca: Webcam 0c45:6143 in documentation. V4L/DVB (8571): gspca: Don't use CONFIG_VIDEO_ADV_DEBUG as a compile option. V4L/DVB (8569): gspca: Set back the old values of Sonix sn9c120 and cleanup source. V4L/DVB (8567): gspca: hflip and vflip controls added for ov519 - ov7670 plus init cleanup. V4L/DVB (8564): fix vino driver build error V4L/DVB (8563): fix drivers/media/video/arv.c compilation V4L/DVB (8562): DVB_DRX397XD: remove FW_LOADER select V4L/DVB (8558): media/video/Kconfig: fix a typo ...
2008-08-07Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6Linus Torvalds
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: hwmon: (it87) Support for 16-bit fan reading in it8705 >= rev 0x03 hwmon: (it87) Support for 16-bit fan reading in it8712 >= rev 0x07 hwmon: (hwmon-vid) Add 6-bit vid codes for AMD NPT 0Fh cpus hwmon: (hwmon-vid) Trivial format multi-line comments per CodingStyle hwmon: ad7414 driver hwmon: (thmc50) Add support for critical temperature limits hwmon: (adm9240) Remove EXPERIMENTAL dependency hwmon: (w83627hf) Drop reset module parameter hwmon: (w83627hf) Add pwm_enable sysfs interface hwmon: (w83791d) Use fan divisor bits from vbat register hwmon: (f71882fg) Delete needless forward declarations hwmon: (dme1737) Add support for the SMSC SCH5027 hwmon: (dme1737) Skip detection if forced hwmon: (dme1737) Cleanups
2008-08-07Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdogLinus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (70 commits) [WATCHDOG] more coding style clean-up's [WATCHDOG] sbc8360.c - move stop code into a function [WATCHDOG] Coding style - Indentation - part 2 [WATCHDOG] Coding style - Indentation - part 1 [WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs [WATCHDOG] mpc8xxx_wdt: fix build [WATCHDOG] mpc8xxx_wdt: various renames, mostly s/mpc83xx/mpc8xxx/g [WATCHDOG] mpc83xx_wdt: rename to mpc8xxx_wdt [WATCHDOG] mpc83xx_wdt: add support for MPC86xx CPUs [WATCHDOG] mpc83xx_wdt: convert to the OF platform driver [WATCHDOG] pcwd: a couple of watchdogs escaped conversion [WATCHDOG] Clean-up includes [WATCHDOG] hpwdt.c - fix double includes [WATCHDOG 57/57] wdt501/pci: Clean up, coding style and switch to unlocked_ioctl [WATCHDOG 56/57] wdt977: clean up, coding style and switch to unlocked_ioctl [WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up oddments of coding style [WATCHDOG 54/57] wdrtas: clean up, coding style, switch to unlocked_ioctl [WATCHDOG 53/57] wafer5823wdt: Clean up, coding style, switch to unlocked_ioctl [WATCHDOG 52/57] w83977f_wdt: clean up, coding style and switch to unlocked_ioctl [WATCHDOG 51/57] w83877f_wdt: clean up code, coding style, switch to unlocked_ioctl ...
2008-08-07Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixesLinus Torvalds
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: kbuild: a better way to generate cscope database change Kconfig: Extend "menuconfig" for modules to simplify Kconfig file bugfix for scripts/patch-kernel in 2.6 sublevel stepping kbuild: fix O=.. build with arm
2008-08-07tracehook: fix CLONE_PTRACERoland McGrath
In the change in commit 09a05394fe2448a4139b014936330af23fa7ec83, I overlooked two nits in the logic and this broke using CLONE_PTRACE when PTRACE_O_TRACE* are not being used. A parent that is itself traced at all but not using PTRACE_O_TRACE*, using CLONE_PTRACE would have its new child fail to be traced. A parent that is not itself traced at all that uses CLONE_PTRACE (which should be a no-op in this case) would confuse the bookkeeping and lead to a crash at exit time. This restores the missing checks and fixes both failure modes. Reported-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Roland McGrath <roland@redhat.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 21:00:17 +0000