development kernel tree: Changes to 'mokopatches-tracking'
git at git.openmoko.org
git at git.openmoko.org
Mon Aug 11 15:40:51 CEST 2008
Rebased ref, commits from common ancestor:
commit a819ba15d0390b4bb3671e49b4ec9e3703681c6a
Author: Andy Green <andy at openmoko.com>
Date: Sun Aug 10 10:01:18 2008 +0100
fix-wm8753-DBG.patch
Signed-off-by: Andy Green <andy at openmoko.com>
commit 9529c2b7733452a1a3fa227ee277285214db70fa
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:01:18 2008 +0100
glamo-cmdqueue-bandaid.patch
[ Stop kernel from hanging every once in a while during Glamo
initialization. ]
debug-glamo-fb-cmdqueue-wait-timeout.patch
From: warmcat <andy at warmcat.com>
commit cb7b0a6f1b6c375d596c25d65e54e82026f0122f
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:01:17 2008 +0100
gta02-sound-bandaid.patch
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=1172
This patch seems to alleviate the symptoms but doesn't cure them.
Keep it to keep development going, until we have a proper solution.
commit fac9a187215d626d6e78ae1ad0d3b792efc8abde
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:01:17 2008 +0100
suspend-prelim1.patch
commit fe4f1a2eecb0542cb12a49a7acecaf0a8b60ed55
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:01:16 2008 +0100
gta01-dehang-printk.patch
This is a temporary work-around Mike Westerhof for this bug:
http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=788
See also
http://lists.openmoko.org/pipermail/openmoko-kernel/2008-February/000804.html
(It's the 2nd option.)
We may settle on a different solution in the future, depending on
feedback from upstream.
commit f40b99ee87012a46eaba8a3493233f5a50ace2ae
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:01:16 2008 +0100
fix-pcf50633-LOWBAT-kill-init.patch
commit e145bb9e4b61379671a090247bfe1bed9404c536
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:01:16 2008 +0100
fix-pcf50606-LOWBAT-kill-init.patch
commit 6237ab18d41532f91971bb80541544be9ff095b4
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:01:16 2008 +0100
fix-hwecc-2410.patch
S3C24xx ECC mis-calculates the bit to flip:
http://lists.infradead.org/pipermail/linux-mtd/2007-October/019586.html
If the error couldn't be corrected, we returned "no problem" :-(
http://lists.infradead.org/pipermail/linux-mtd/2007-October/019615.html
Signed-off-by: Werner Almesberger <werner at openmoko.org>
commit ec7f4fcf7049ad4a125a3e4ac07db8befe74f201
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:01:16 2008 +0100
atheros_2_0_sdio_stack.patch
commit 459d01af0b257d65a51347436f8203cfc7cd936e
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:01:15 2008 +0100
atheros_2_0_hcd.patch
commit 675de1a5a2869a730bc24ed01e9d94589732e0c7
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:01:15 2008 +0100
atheros_2_0_function.patch
commit 6743098b3d5e70071e2ca7c4182c51e66f6fda9f
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:01:15 2008 +0100
pnp_fixes.patch
commit 9ebdebd72c36d9374e28b7a094e41f159e71d962
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:01:07 2008 +0100
s3c2410-usb-switch.patch
commit d90c12cdece775e04f3a0ce1a1c726182bdff379
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:41 2008 +0100
fix-EVIOCGRAB-semantics.patch
commit d611ea1b6d342bab2a75451ecf4a7f9d48a79d95
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:41 2008 +0100
bq27000-battery-driver.patch
commit 4e81220bae89f953a8164a1ef5d0336ece55c867
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:41 2008 +0100
fiq-hdq.patch
commit 97d2d64911d9e586795ded1a71ed76aa0a56fb2d
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:41 2008 +0100
introduce-fiq-migrate-vibrator-gta02-only.patch
On GTA02 we use FIQ to manage the vibrator IO now. That
is necessary because we stole timer3 from doing hw pwm
for vibrator. This keeps the same UI in /sys but does
"bitbang pwm" on the same vibrator GPIO
From: Andy Green <andy at openmoko.com>
Signed-off-by: Andy Green <andy at openmoko.com>
commit e65a352f9f983790451605e85a8da7acdeac76d1
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:41 2008 +0100
introduce-fiq-use-timer3-as-source.patch
This makes the FIQ stuff specific to one of the timers on the
s3c244x and adds the platform stuff for fiq in the gta02 init
Currently one sysfs node is exposed, a count of FIQ events
cat /sys/devices/platform/sc32440_fiq.0/fiq/count
From: Andy Green <andy at openmoko.com>
Signed-off-by: Andy Green <andy at openmoko.com>
commit 54d1fdcee7751cefebb8a98eca23d2a37784b1bf
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:40 2008 +0100
introduce-fiq-basis.patch
Adds a C-based FIQ ISR which is very convenient (and unusual --
normally you have to do FIQ ISR in assembler only).
Based on my article:
http://warmcat.com/_wp/2007/09/17/at91rm9200-fiq-faq-and-simple-example-code-patch/
Implemented as a platform device and driver.
Suspend / resume is tested and works.
Signed-off-by: Andy Green <andy at warmcat.com>
commit a3bf2f6931727684aa66b4e0555ba405db90d7c5
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:40 2008 +0100
fail-unless-uimage.patch
Fail the build noisily if "mkimage" can't be found, e.g., if we forgot to add
the u-boot directory to PATH.
commit 466c455d3ca4068c61988af3e80d3fef440c0192
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:40 2008 +0100
s3c2410-qt2410-buttons.patch
commit 16bb0d4cf6f93557b5c5c4c30d8fb223449c07a0
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:40 2008 +0100
qt2410-cs8900.patch
commit de2f8ae511394636bad32f6c5c56f321f729ed31
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:40 2008 +0100
s3c2440-nand-disable-hwecc.patch
Disable the hardware ECC checking on S3C2440 based platforms (HXD8, SMDK2440,
GTA02) for the time being, since our u-boot doesn't yet support it for 2k page
size NAND
commit 24064544672c20c200674704f0525fec6fb3cac5
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:40 2008 +0100
input-nots-mousedev.patch
This patch disables the reporting of touchscreen-like devices via
/dev/input/mice. In the Neo1973 (much like other handheld devices),
we need this to distinguish between the touchscreen (which uses tslib)
and optional additional usb/bluetooth mice that might be attached.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 721a6fc3c640049e8e7f28d77b7b2579be8cfca2
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:39 2008 +0100
s3c2410_serial-nodebug.patch
commit 2c37c044508af98c8be66c7d02913a3861779908
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:39 2008 +0100
pm-debug_less_verbose.patch
commit a34d84672ad7c75aa0dcc8c30fae9a262035482c
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:39 2008 +0100
config-nr-tty-devices.patch
commit 713b1d6c0e76e1dbc1e24f35127930070fe9c3b9
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:39 2008 +0100
openmoko-logo.patch
commit 0b2584b5481b3dcb243dd99595c0719b5ac49800
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:38 2008 +0100
gta02-bt-fixes.patch
Modify GTA02 power manager for bluetooth.
1. Default power value isn't correct. Now we set pcf50633 LDO4 to 3.2 voltage.
2. Separate GTA01 and GTA02 source code.
3. Add pcf50633 API for enable register.
commit bbf697bd3f67c0773ba357e8304264e8f3f6b342
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:37 2008 +0100
pcf506xx.patch
Moved shared PMU code from pcf50606.h and pcf50633.h (which prevented inclusion
of both at the same time) to pcf506xx.h
- include/linux/pcf50606.h (struct pmu_voltage_rail, enum pmu_event, pmu_cb):
moved to pcf506xx.h
- include/linux/pcf50633.h (struct pmu_voltage_rail, enum pmu_event, pmu_cb):
moved to pcf506xx.h
Signed off-by: Werner Almesberger <werner at openmoko.org>
commit e05550e0a6944b1b0ae6278a0d55211ee44680d7
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:05 2008 +0100
gta02-acc.patch
commit 9a7997ffffbfa65ad521d098342c35e8693fcf07
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:05 2008 +0100
gta02-leds.patch
commit 7a958f2b2d065ac0cd488fda0716a257e06950f3
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:04 2008 +0100
lis302dl.patch
This is a Linux driver for the STmicro LIS302DL 3-axis accelerometer.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 63dc4a0d35cbf8683a94be0ddd5228b60f2be8c6
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:04 2008 +0100
gta02-sound.patch
commit 61f4cd667a5c6e8b05ce3290b41b2ecc34b0503e
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:04 2008 +0100
gta02-power_control.patch
commit 5d94f162c413b56b1d6c0596961e748450ef1671
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:04 2008 +0100
gta02-core.patch
commit d495743d2139a9c035b1d7e10acdf09551ea4bd7
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 10:00:03 2008 +0100
glamo-mmc.patch
commit 2fd1132c2da5774c4dcdde0c5561d7765f89753c
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:59:18 2008 +0100
smedia-glamo.patch
[ FIXME:
include/asm-arm/arch-s3c2410/irqs.h shouldn't contain device-specific
changes. ]
This is a Linux kernel driver for the Smedia Glamo336x / Glamo337x
multi-function peripheral device.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 33fff712c1e0288f91f20f818c198c621a4852d5
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:59:17 2008 +0100
pcf50633-suspend-hacks.patch
commit 80e8209e5d4f35361ed7a25a3e8e9ed132ca1edc
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:59:17 2008 +0100
pcf50633.patch
commit 5990f04c1865984feb2d6e4aacc27c69f6ea18ea
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:59:17 2008 +0100
s3c2442b-cpuid.patch
Add the Samsung S3C2442B CPU idcode to the samsung s3c24xx platform code
and fix a Kconfig typo related tot the 2442.
commit ca4bbaa70151598506ceb61101f8ae861e3aa8d0
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:59:17 2008 +0100
s3c2410_udc-2440_dual_packet-workaround.patch
This is a patch that seems to make the USB hangs on the S3C2440 go away. At
least a good amount of ping torture didn't make them come back so far.
The issue is that, if there are several back-to-back packets,
sometimes no interrupt is generated for one of them. This
seems to be caused by the mysterious dual packet mode, which
the USB hardware enters automatically if the endpoint size is
half that of the FIFO. (On the 2440, this is the normal
situation for bulk data endpoints.)
There is also a timing factor in this. I think what happens is
that the USB hardware automatically sends an acknowledgement
if there is only one packet in the FIFO (the FIFO has space
for two). If another packet arrives before the host has
retrieved and acknowledged the previous one, no interrupt is
generated for that second one.
However, there may be an indication. There is one undocumented
bit (none of the 244x manuals document it), OUT_CRS1_REG[1],
that seems to be set suspiciously often when this condition
occurs. There is also CLR_DATA_TOGGLE, OUT_CRS1_REG[7], which
may have a function related to this. (The Samsung manual is
rather terse on that, as usual.)
This needs to be examined further. For now, the patch seems to do the
trick.
Note that this is not a clean solution by any means, because we
might potentially get stuck in that interrupt for quite a while.
commit 6ad476fa73ee60baa989ec4b421a358678f77435
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:59:17 2008 +0100
s3c24xx-nand-largepage.patch
MTD: S3C24XX large page NAND support
This adds support for using large page NAND devices
with the S3C24XX NAND controller. This also adds the
file Documentation/arm/Samsung-S3C24XX/NAND.txt to
describe the differences.
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
commit a2c2654e050844543c900b78df1432bd7226e21a
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:59:16 2008 +0100
s3c_mci-gta01.patch
commit d3624f451e3237ba5a0b0b132a1cb4a4ead528cd
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:58:13 2008 +0100
s3c_mci.patch
This is a MMC/SD driver for the Samsung S3C24xx SD/MMC controller, originally
developed years ago by Thomas Kleffel <tk at maintech.de>.
Due to time restraints, he had no time to further maintain the driver and
follow the mainline Linux changes in the SD/MMC stack.
With his authorization, I have taken over the task of making it compliant to
the current mainline SD/MMC API and take care of the mainline kernel merge.
After a potential kernel inclusion, we would co-maintain the driver.
Acked-by: Thomas Kleffel <tk at maintech.de>
Signed-off-by: Harald Welte <laforge at gnumonks.org>
commit 39cc775caeeb7d91751de8bf5bd71fe42702b155
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:58:13 2008 +0100
g_ether-vendor_product.patch
Use FIC's own USB Vendor ID rather than NetChip's
Yes, we could solve this by some modprobe.conf parameters, but I'd like to
rather not rely on this.
commit eaf8358ce133f2d67f5968eacc3761a8a60869f1
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:58:12 2008 +0100
g_ether-highpower.patch
commit 7cd56643a41d0c03ceca90bd67eac36bf81739e5
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:58:12 2008 +0100
i2c-permit_invalid_addrs.patch
We need this stupid workaround since our amplifier chip uses a 'reserved' I2C
address
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit eb8a96d9aa5c5b69409ead0c5556c4d4de6bfbc0
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:58:12 2008 +0100
s3c2410_ts-gta01.patch
commit cc69df3570113d1826b61bde484ff1b492460e98
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:58:07 2008 +0100
s3c2410_touchscreen.patch
commit 0630595b866015e5e4cd0ed27744bdf87013fb43
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:56:57 2008 +0100
gta01-backlight.patch
This is a backlight driver for the FIC/OpenMoko Neo1973 GTA01 GSM Phone
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 0c906f94198e6b8923de78d2efb495ec48cbeb66
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:56:57 2008 +0100
gta01-vibrator.patch
This patch adds driver support for the vibator device of the FIC/OpenMoko
Neo1973 GSM phone. The driver uses the existing LED class driver framework,
since there's a lot of similarity between the LED and the vibrator function.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 16abd793cb3422adee82eb9d598336dea381791e
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:56:57 2008 +0100
s3c2410-pwm.patch
This patch adds a PWM api abstraction for the S3C2410 SoC
Signed-off-by: Javi Roman <javiroman at kernel-labs.org>
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 90ba6101cdd48b8b28972f204873050d4174c20d
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:56:56 2008 +0100
gta01-power_control.patch
[PATCH] Neo1973 GPS / GSM / Bluetooth power control via sysfs
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 20b6518b5511d0963214966487c49a8355a38bc5
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:56:56 2008 +0100
gta01-inputdevice.patch
This provides support for the GTA01 keyboard
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 1ff404776a8837b00d446e6437c95bc0e2b6561b
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:56:56 2008 +0100
gta01-jbt6k74.patch
This driver adds support for the SPI-based control interface of the LCM (LCD
Panel) found on the FIC GTA01 hardware.
The specific panel in this hardware is a TPO TD028TTEC1, but the driver should
be able to drive any other diplay based on the JBT6K74-AS controller ASIC.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit ebb80ab78c0d5eb0be7b5eba3ec5c1fd06900149
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:56:56 2008 +0100
gta01-core.patch
This patch adds support for the FIC Neo1973 GTA01 machine type to the ARM port
of the Linux kernel.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit ec7a0d43c7aeb2fb5044ec8c7ebda187eec21797
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:56:55 2008 +0100
gta01-pcf50606.patch
This is a NXP PCF50606 power management unit driver.
The PCF50606 is used in the FIC/OpenMoko Neo1973 GTA01 GSM phone.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit 3f6c5cad4f281b3a60083b8b8a8f16da50d9376f
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:56:55 2008 +0100
s3c2410-bbt.patch
[PATCH] Add Kconfig option to enable NAND bad-block-table support for s3c2410
This patch adds a new CONFIG_MTD_NAND_S3C2410_BBT which, if enabled,
asks the mtd NAND core to use a bad-block table.
Signed-off-by: Harald Welte <laforge at openmoko.org>
commit e7b16cdd27a844cee7dbd431d15de7f2bdd38bd5
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:56:55 2008 +0100
resume-timers-wq.patch
The initialization of clocks uses mutexes, but we execute the resume in
an interrupt context. We therefore have to hand this task to a non-interrupt.
Adapted from a patch by Andy Green.
commit c6e345e56d1344fb1099ce64e30367921d12f106
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:56:55 2008 +0100
fix-i2c-s3c2410-resume-race.patch
fix-i2c-s3c2410-resume-race.patch
There is a nasty race between i2c-s3c2410 resume and resume of I2C
driver and the client drivers -- the watchdog device actually gets to
use the dead I2C bus before it is reinitialized by the I2C driver
resume! This patch makes sure any customers get turned away until
the shopkeeper has woken up.
Signed-off-by: Andy Green <andy at openmoko.com>
commit 6e2d4bc17b8220fcb294c8fe4979d8d5f4b1dc92
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:56:54 2008 +0100
gta01-no_nand_partitions.patch
[PATCH] support mtd NAND commandline partitions for S3C2410
This patch adds support for the mtd NAND core standard method of passing
partition table information from the bootloader into the kernel by using
the kernel commandline.
The board specific code can still manually override and provide a fixed
partition table, so this patch will behave backwards compatible.
Signed-off-by: Harald Welte <laforge at openmoko.org>
Acked-byt: Ben Dooks <ben-linux at fluff.org>
commit dbad7ebc290ed5f3dcf731244a8f7d7d1f99da69
Author: mokopatches <mokopatches at openmoko.org>
Date: Sun Aug 10 09:56:54 2008 +0100
explicitly-link-notes-section.patch
Since 2.6.23 kbuild produces a 3GB arch/arm/boot/Image because it includes a
.note.gnu.build-id section at address 0 which is followed by 3GB of 0x00.
The --build-id option is set in the toplevel Makefile.
This patch explicitly puts the notes section after the TEXT section.
commit 796aadeb1b2db9b5d463946766c5bbfd7717158c
Merge: 56831a1a883bb8376ea56ce8f3b1d5844c94d257 34ae7f35a21694aa5cb8829dc5142c39d73d6ba0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 8 16:19:49 2008 -0700
Merge branch 'fixes' of 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.
commit 56831a1a883bb8376ea56ce8f3b1d5844c94d257
Merge: 6724cce8fb4b408ae1a2fab455050f3407c80144 ad8b15f0ffc297cdd6c65ef7552b3b8abd11a401
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 8 16:18:34 2008 -0700
Merge branch 'master' of 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
commit 6724cce8fb4b408ae1a2fab455050f3407c80144
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Fri Aug 8 13:56:20 2008 -0700
list.h: fix fatal kernel-doc error
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 at oracle.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ad8b15f0ffc297cdd6c65ef7552b3b8abd11a401
Author: Steve French <sfrench at us.ibm.com>
Date: Fri Aug 8 21:10:16 2008 +0000
[CIFS] list entry can not return null
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 34ae7f35a21694aa5cb8829dc5142c39d73d6ba0
Author: Mark Langsdorf <mark.langsdorf at amd.com>
Date: Thu Jul 31 12:39:12 2008 -0500
[CPUFREQ][2/2] preregister support for powernow-k8
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 at amd.com>
Tested-by: Frank Arnold <frank.arnold at amd.com>
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Dave Jones <davej at redhat.com>
commit 23431b495fcbbde6d09aba30019b6a224d543cf9
Author: Mark Langsdorf <mark.langsdorf at amd.com>
Date: Thu Jul 31 12:39:05 2008 -0500
[CPUFREQ][1/2] whitespace fix for powernow-k8
Trivial whitespace fix for powernow-k8.
Signed-off-by: Mark Langsdorf <mark.langsdorf at amd.com>
Signed-off-by: Dave Jones <davej at redhat.com>
commit bc5f65d42e6276747f3daf2a9e0617e7763193fa
Author: Dave Jones <davej at redhat.com>
Date: Thu Jul 31 18:22:59 2008 -0400
[CPUFREQ] Update MAINTAINERS to reflect new mailing list.
Mailing list moved to vger.
Signed-off-by: Dave Jones <davej at redhat.com>
commit 460f5ef2835dbc33825f611f408eb09c29be4b85
Author: Dave Jones <davej at redhat.com>
Date: Wed Jul 30 13:01:42 2008 -0400
[CPUFREQ] Fix warning in elanfreq
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 at redhat.com>
commit f068c04ba6f308774fdd2ed5e113da7cf4ff2f2b
Author: Dave Jones <davej at redhat.com>
Date: Wed Jul 30 12:59:56 2008 -0400
[CPUFREQ] Fix -Wshadow warning in conservative governor.
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 at redhat.com>
commit ec983f7060cd73e14cdd3edd910339127a8a4e96
Author: Dave Jones <davej at redhat.com>
Date: Wed Jul 30 12:05:03 2008 -0400
[CPUFREQ] Remove EXPERIMENTAL annotation from VIA C7 powersaver kconfig.
This has been pretty solid, and doesn't see much change at all.
Noticed by Harald Welte.
Signed-off-by: Dave Jones <davej at redhat.com>
commit 49b75b87ce2dfbd99e59a50c3681b154d07e3a22
Merge: f1c7f79b6ab4f7ada002a0fae47f462ede6b6857 097d9eb537ff4d88b74c3fe67392e27c478ca3c5
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 8 11:38:42 2008 -0700
Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-arm
* '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
commit f1c7f79b6ab4f7ada002a0fae47f462ede6b6857
Author: Adrian Bunk <bunk at kernel.org>
Date: Fri Aug 8 19:26:42 2008 +0300
[NFSD] uninline nfsd4_op_name()
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 at kernel.org>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
[ Also made it "const char *" - Linus]
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 097d9eb537ff4d88b74c3fe67392e27c478ca3c5
Merge: c41107c2d4fd31924533f4dbc4c3428acc2b5894 aeee90dfa01844168cd7f8051d0a0f969c573067
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Fri Aug 8 17:33:47 2008 +0100
Merge Linus' latest into master
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
commit f2d7499be1b1fe1cd8a5e6a01c1f44173894a241
Merge: 8d659f5e43c5db2630e85f507b7384365e9e1c1e 76aab2c1eae491a5d73ac83deec97dd28ebac584
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 8 11:15:23 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* 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
...
commit 8d659f5e43c5db2630e85f507b7384365e9e1c1e
Merge: 9da1f7e69aa4545d45d3435865c56f1e67c4b26a 433c5f706856689be25928a99636e724fb3ea7cf
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Fri Aug 8 11:14:32 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* 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
commit 9da1f7e69aa4545d45d3435865c56f1e67c4b26a
Author: Junio C Hamano <gitster at pobox.com>
Date: Thu Aug 7 18:45:08 2008 -0700
powerpc: Do not ignore arch/powerpc/include
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 at pobox.com>
Acked-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c41107c2d4fd31924533f4dbc4c3428acc2b5894
Author: Adrian Bunk <bunk at kernel.org>
Date: Sat Jul 19 17:54:22 2008 +0100
[ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB
This patch removes the commented out line for the not available
CONFIG_SA1100_USB option.
Reported-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 3b8861715a9c17151e24f03e4ab2c30e6d8a0748
Author: Philipp Zabel <philipp.zabel at gmail.com>
Date: Wed Jul 9 21:27:15 2008 +0100
[ARM] 5166/1: magician: add MAINTAINERS entry
Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
Acked-by: Eric Miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 2727f226a65e034f93846def7fab314dee430df3
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Fri Aug 8 15:13:27 2008 +0100
[ARM] fix pnx4008 build errors
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 at arm.linux.org.uk>
commit 433c5f706856689be25928a99636e724fb3ea7cf
Author: David S. Miller <davem at davemloft.net>
Date: Thu Aug 7 23:04:37 2008 -0700
sparc64: Fix end-of-stack checking in save_stack_trace().
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 at davemloft.net>
commit 76aab2c1eae491a5d73ac83deec97dd28ebac584
Author: Jamal Hadi Salim <hadi at cyberus.ca>
Date: Thu Aug 7 20:37:22 2008 -0700
pkt_sched: Fix actions referencing
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 at cyberus.ca>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 4ab84d450e24b3a309608182a8d8e30626b46f8f
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Thu Aug 7 20:33:19 2008 -0700
bnx2x: fix logical op
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 at oracle.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c1c6c11a6860c8135fd0d923c3d49fb368889b10
Merge: 2aaab9a0ccfd2ccf1c957cc2120da8d5593955c5 cfeb414537b1d7c23ba202f198fa4154cd5a4856
Author: David S. Miller <davem at davemloft.net>
Date: Thu Aug 7 20:28:46 2008 -0700
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
commit 2aaab9a0ccfd2ccf1c957cc2120da8d5593955c5
Author: Adam Langley <agl at imperialviolet.org>
Date: Thu Aug 7 20:27:45 2008 -0700
tcp: (whitespace only) fix confusing indentation
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 at imperialviolet.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 827ebd6410005b05b3c930ef6a116666c6986886
Author: David S. Miller <davem at davemloft.net>
Date: Thu Aug 7 20:26:40 2008 -0700
pkt_sched: Fix qdisc config when link is down.
Bug reported by Stephen Hemminger.
We need to fetch the root from ->qdisc_sleeping not ->qdisc.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 22c7fdf4a7acfa24d9d498b1357e6c07d0e6c553
Merge: 5423b2ed25993e13009ce39f55d742c3c6d03edb 86b89eed9aca2a4a335b9c1bf7380f9183db431f
Author: David S. Miller <davem at davemloft.net>
Date: Thu Aug 7 18:52:57 2008 -0700
Merge branch 'ath9k' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
commit aeee90dfa01844168cd7f8051d0a0f969c573067
Merge: 273b2578392bbf6e5c47a8a3d1ee461ce6fc7182 5861bbfcc10fc0358abf52c7d22850c8d180f0b0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Aug 7 18:14:24 2008 -0700
Merge branch 'tracehook' of 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
commit 273b2578392bbf6e5c47a8a3d1ee461ce6fc7182
Merge: 8e43e12d638f732fa32600c324711f4be8fe0b1d 06a91a02e9b249695f964bb59c8b02152c21e90c
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Aug 7 18:14:07 2008 -0700
Merge branch 'for-linus' of 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()
commit 8e43e12d638f732fa32600c324711f4be8fe0b1d
Merge: 01b09b6c605ed119fba75b82582f017e44dd4a55 62aa0054da220b8bbe6f23c0eb1d97a99005d0b3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Aug 7 18:13:30 2008 -0700
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* '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
commit 01b09b6c605ed119fba75b82582f017e44dd4a55
Merge: c1ec8295f6e8c888230bbc9b7a416dc26d03688e bf9c8c9ddef7ef761ae9747349175adad0ef16ce
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Aug 7 18:12:41 2008 -0700
Merge branch 'for-linus' of 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
commit c1ec8295f6e8c888230bbc9b7a416dc26d03688e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Aug 7 18:10:12 2008 -0700
Fix up duplicate '__s3c2410wdt_stop()' function
Looks like somebody didn't get enough sleep.
Noticed-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3d8cd0c5d75c424f986c0602dc26579fbb7c8080
Merge: 4c514a5ad1314b872e3185dabaf105c81d39d7e8 58750139001bae11a1f9b074f3a9c774fecf5ba8
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Aug 7 18:07:33 2008 -0700
Merge branch 'for-linus' of 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.
commit 4c514a5ad1314b872e3185dabaf105c81d39d7e8
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Thu Aug 7 14:08:27 2008 +1000
powerpc/iseries: remove the old viocons driver
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 at canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b80b601f0087391e55d3859e70f08278632b1185
Merge: a06dee41a31bff488a261dfc542776ffd2f24ff1 04793dd041bbb88a39b768b714c725de2c339b51
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Aug 7 18:06:19 2008 -0700
Merge branch 'for_linus' of 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
...
commit a06dee41a31bff488a261dfc542776ffd2f24ff1
Merge: b588e2bbd7b872c9cdf635fe0f04840534e72443 816d8c6a2580562698cf0fa0b9e5b4dd570e636e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Aug 7 18:05:39 2008 -0700
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* '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
commit b588e2bbd7b872c9cdf635fe0f04840534e72443
Merge: 3df302ff56fac91d54e964faed9d293018ac71ca 7944d3a5a70ee5c1904ed1e8b1d71ff0af2854d9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Aug 7 18:05:09 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* 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
...
commit 3df302ff56fac91d54e964faed9d293018ac71ca
Merge: 685d87f7ccc649ab92b55e18e507a65d0e694eb9 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Thu Aug 7 18:04:28 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* 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
commit 5861bbfcc10fc0358abf52c7d22850c8d180f0b0
Author: Roland McGrath <roland at redhat.com>
Date: Thu Aug 7 16:55:03 2008 -0700
tracehook: fix CLONE_PTRACE
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 at redhat.com>
Signed-off-by: Roland McGrath <roland at redhat.com>
commit 764f2579d95120e1c76b7af1256d02466ddd00bf
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Thu Aug 7 15:33:36 2008 -0700
sparc: don't use asm/of_device.h
Use linux/of_device.h instead.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 058ddee5625ade9e9e011b9ae155ac3b8d4eda3a
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Thu Aug 7 22:36:59 2008 +0100
[ARM] Fix SMP booting with non-zero PHYS_OFFSET
The existing code tries to get the pmd for the temporary page table
by doing:
pgd = pgd_alloc(&init_mm);
pmd = pmd_offset(pgd, PHYS_OFFSET);
Since we have a two level page table, pmd_offset() is a no-op, so
this just has a casting effect from a pgd to a pmd - the address
argument is unused. So this can't work.
Normally, we'd do:
pgd = pgd_offset(&init_mm, PHYS_OFFSET);
...
pmd = pmd_offset(pgd, PHYS_OFFSET);
to get the pmd you want. However, pgd_offset() takes the mm_struct,
not the (unattached) pgd we just allocated. So, instead use:
pgd = pgd_alloc(&init_mm);
pmd = pmd_offset(pgd + pgd_index(PHYS_OFFSET), PHYS_OFFSET);
Reported-by: Antti P Miettinen <ananaza at iki.fi>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 06a91a02e9b249695f964bb59c8b02152c21e90c
Merge: 3f44675439b136d51179d31eb5a498383cb38624 be43324d8b316fe83a7b4027334f2825f1121c2c 70117b9e866b1fdf7e4e84ffb6f38a7b3e9702f8 e08198169ec5facb3d85bb455efa44a2f8327842 cd55ef5a10d1a2ea09853bc5fa40aadaf9f80614 6e0d733d921526e628107fb8b1aff5f7de870d6f
Author: Roland Dreier <rolandd at cisco.com>
Date: Thu Aug 7 14:12:03 2008 -0700
Merge branches 'cma', 'cxgb3', 'ipath', 'ipoib', 'mad' and 'mlx4' into for-linus
commit cd55ef5a10d1a2ea09853bc5fa40aadaf9f80614
Author: Julien Brunel <brunel at diku.dk>
Date: Thu Aug 7 14:11:56 2008 -0700
IB/mad: Test ib_create_send_mad() return with IS_ERR(), not == NULL
In case of error, the function ib_create_send_mad() returns an ERR
pointer, but never returns a NULL pointer. So testing the return
value for error should be done with IS_ERR, not by comparing with
NULL.
A simplified version of the semantic patch that makes this change is
as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@correct_null_test@
expression x,E;
statement S1, S2;
@@
x = ib_create_send_mad(...)
<... when != x = E
if (
(
- x at p2 != NULL
+ ! IS_ERR ( x )
|
- x at p2 == NULL
+ IS_ERR( x )
)
)
S1
else S2
...>
? x = E;
// </smpl>
Signed-off-by: Julien Brunel <brunel at diku.dk>
Signed-off-by: Julia Lawall <julia at diku.dk>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 6e0d733d921526e628107fb8b1aff5f7de870d6f
Author: Alex Naslednikov <xalex at mellanox.co.il>
Date: Thu Aug 7 14:06:50 2008 -0700
IB/mlx4: Allow 4K messages for UD QPs
Current code limits the max message size to 2K for UD QPs, while MTU
might be as big as 4K. This patch sets the maximum message size to
4K, which is needed for UD to work correctly on fabrics with a 4K MTU.
Signed-off-by: Alex Naslednikov <xalex at mellanox.co.il>
Signed-off-by: Eli Cohen <eli at mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit cfeb414537b1d7c23ba202f198fa4154cd5a4856
Author: Marcel Holtmann <marcel at holtmann.org>
Date: Thu Aug 7 22:26:56 2008 +0200
[Bluetooth] Add full quirk implementation for btusb driver
This implements all the quirk handling from the hci_usb driver to the
new btusb driver.
Signed-off-by: Oliver Neukum <oneukum at suse.de>
Signed-off-by: Marcel Holtmann <marcel at holtmann.org>
commit 943d56b0a578cfc10e0340c6f8d6b8795d380e67
Author: Marcel Holtmann <marcel at holtmann.org>
Date: Thu Aug 7 22:26:55 2008 +0200
[Bluetooth] Removal of unnecessary ignore module parameter
This removes the unnecessary ignore parameter, which is useless. There
are alternate methods of kicking a driver off an USB device.
Signed-off-by: Oliver Neukum <oneukum at suse.de>
Signed-off-by: Marcel Holtmann <marcel at holtmann.org>
commit 28111eb2f5087c5aa5ec3697388f6c7d354b2ad8
Author: Marcel Holtmann <marcel at holtmann.org>
Date: Thu Aug 7 22:26:54 2008 +0200
[Bluetooth] Add parameters to control BNEP header compression
The Bluetooth qualification for PAN demands testing with BNEP header
compression disabled. This is actually pretty stupid and the Linux
implementation outsmarts the test system since it compresses whenever
possible. So to pass qualification two need parameters have been added
to control the compression of source and destination headers.
Signed-off-by: Marcel Holtmann <marcel at holtmann.org>
commit 86b89eed9aca2a4a335b9c1bf7380f9183db431f
Author: Sujith <Sujith.Manoharan at atheros.com>
Date: Thu Aug 7 10:54:57 2008 +0530
ath9k: Revamp wireless mode usage
Use a single enum for managing modes, store supported modes by
the HW in a bitmask.
Register legacy rates with mac80211 only at init.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan at atheros.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 3b95978ddadbab594aad6280bfa660a49948af86
Author: Sujith <Sujith.Manoharan at atheros.com>
Date: Thu Aug 7 10:54:33 2008 +0530
ath9k: More unused macros
Signed-off-by: Sujith Manoharan <Sujith.Manoharan at atheros.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit f22f558dcaaf2ca413571df0ae8219474af1a46f
Author: Sujith <Sujith.Manoharan at atheros.com>
Date: Thu Aug 7 10:54:07 2008 +0530
ath9k: Remove a few unused macros and fix indentation
Signed-off-by: Sujith Manoharan <Sujith.Manoharan at atheros.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 06df8bea27e9d6fe4657e8ca0557ab7515695f00
Author: Sujith <Sujith.Manoharan at atheros.com>
Date: Thu Aug 7 10:53:39 2008 +0530
ath9k: Use mac80211's band macros and remove enum hal_freq_band
Signed-off-by: Sujith Manoharan <Sujith.Manoharan at atheros.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit ea9880fb059e0e95d651eab6029f58e7c81b8602
Author: Sujith <Sujith.Manoharan at atheros.com>
Date: Thu Aug 7 10:53:10 2008 +0530
ath9k: Remove redundant data structure ath9k_txq_info
Use ath9k_tx_queue_info which contains the same elements,
and merge get/set functions of tx queue properties.
Also, fix whitespace damage in struct ath_softc.
Signed-off-by: Sujith Manoharan <Sujith.Manoharan at atheros.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 60b67f519213cf6d59236d065b0953962b56abca
Author: Sujith <Sujith.Manoharan at atheros.com>
Date: Thu Aug 7 10:52:38 2008 +0530
ath9k: Cleanup data structures related to HW capabilities
Signed-off-by: Sujith Manoharan <Sujith.Manoharan at atheros.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit b08cbcd4546445740c2a04291204b56f8baf7be2
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Aug 5 22:06:51 2008 +0300
ath9k: work around gcc ICEs
This patch works around an internal compiler error (gcc bug #37014) in
all gcc 4.2 compilers and the gcc 4.3 series up to at least 4.3.1
on at least powerpc and mips.
Many thanks to Andrew Pinski for analyzing the gcc bug.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit f078f209704849c86bd43c0beccfc1f410ed1c66
Author: Luis R. Rodriguez <lrodriguez at atheros.com>
Date: Mon Aug 4 00:16:41 2008 -0700
ath9k: Add new Atheros IEEE 802.11n driver
This adds the new mac80211 11n ath9k Atheros driver. Only STA support
is currently enabled and tested.
Signed-off-by: Senthil Balasubramanian <senthilkumar at atheros.com>
Signed-off-by: Felix Fietkau <nbd at openwrt.org>
Signed-off-by: Jack Howarth <howarth at bromo.msbb.uc.edu>
Signed-off-by: Jouni Malinen <jouni.malinen at atheros.com>
Signed-off-by: Sujith Manoharan <Sujith.Manoharan at atheros.com>
Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
Signed-off-by: Pavel Roskin <proski at gnu.org>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth at atheros.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit b1a5215004130689aeee9e522585c879d3b71472
Author: Luis R. Rodriguez <lrodriguez at atheros.com>
Date: Mon Aug 4 00:16:40 2008 -0700
ath5k: remove Atheros 11n devices from supported list
Remove Atheros 11n devices from being claimed by ath5k as its
now handled by ath9k.
Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 00e8a4da8cf0d7dba8cc4b0da28ea0f12dcf6b36
Author: Luis R. Rodriguez <lrodriguez at atheros.com>
Date: Wed Aug 6 13:28:54 2008 -0700
list.h: add list_cut_position()
This adds list_cut_position() which lets you cut a list into
two lists given a pivot in the list.
Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 7d283aee50351ec19eaf654a8690d77c4e1dff50
Author: Luis R. Rodriguez <lrodriguez at atheros.com>
Date: Wed Aug 6 15:21:26 2008 -0700
list.h: Add list_splice_tail() and list_splice_tail_init()
If you are using linked lists for queues list_splice() will not do what
you would expect even if you use the elements passed reversed. We need
to handle these differently. We add list_splice_tail() and
list_splice_tail_init().
Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
Signed-off-by: Luis R. Rodriguez <lrodriguez at atheros.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 5423b2ed25993e13009ce39f55d742c3c6d03edb
Author: Christian Lamparter <chunkeey at web.de>
Date: Thu Aug 7 10:22:28 2008 +0200
p54: swap short slot time dcf values
these "magic" values must to be the other way round...
Signed-off-by: Christian Lamparter <chunkeey at web.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 0fc980392e5a06cff34ca7acaac5790bb59528d1
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Wed Aug 6 16:18:31 2008 +0200
rt2x00: Block all unsupported modes
It was possible for unsupported operating modes
to be accepted by the add_interface callback function.
This patch will block those modes until proper support
has been implemented for them.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 8dbc1722a78343eb80f0ce1a3ef1965a9774ad5b
Author: Luis Carlos Cobo <luisca at cozybit.com>
Date: Wed Aug 6 13:17:54 2008 +0200
mac80211: keep mesh ifaces in allmulti mode
Currently a mesh node will not forward a multicast frame if it is not subscribed
to the specific multicast address. This patch addresses the issue and fixes mesh
multicast forwarding.
Signed-off-by: Luis Carlos Cobo <luisca at cozybit.com>
Acked-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit e32f85f7b917456265d4c30d15f734c4912cfa6a
Author: Luis Carlos Cobo <luisca at cozybit.com>
Date: Tue Aug 5 19:34:52 2008 +0200
mac80211: fix use of skb->cb for mesh forwarding
Now we deal with mesh forwarding before the 802.11->802.3 conversion, thus
eliminating a few unnecessary steps. The next hop lookup is called from
ieee80211_master_start_xmit() instead of subif_start_xmit(). Until the next hop
is found, RA in the frame will be all zeroes for frames originating from the
device. For forwarded frames, RA will contain the TA of the received frame,
which will be necessary to send a path error if a next hop is not found.
Signed-off-by: Luis Carlos Cobo <luisca at cozybit.com>
Acked-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit eda0c003d1ff14c99d8476b482377ccfaf967b6c
Author: Larry Finger <Larry.Finger at lwfinger.net>
Date: Tue Aug 5 11:23:16 2008 -0500
p54: Fix for TX sequence number problem
Following "mac80211: fix TX sequence numbers", if a packet
has the IEEE80211_TX_CTL_ASSIGN_SEQ assigned, a sequence number must be
supplied, either by hardware or software. AFAIK, no such hardware exists
for the p54, thus it must be done in software. With this patch, a connection
qith p54usb is stable, whereas the interface went off-line in 2-3 hours
without this change. Note that this code will have to be reworked for proper
sequence numbers on beacons. In addition, the sequence number has been placed
in the hardware state, not the vif state.
Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit f367422794315b7632f2a78c93e15b3c757d4be8
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Mon Aug 4 16:00:44 2008 +0800
iwlwifi: cleanup iwl_tx_skb
This patch cleans up iwl_tx_skb function.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit afd2fc02ab7bae6062671c5ca80dd34c34a63fb7
Merge: 1f4de5a0e3b4a4b8afa2cddb46429d32e1053c14 214c6a7ed13e01cab2addeef56124067e4d20147
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Thu Aug 7 11:05:25 2008 +0100
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Conflicts:
arch/arm/mach-pxa/generic.c
arch/arm/mach-pxa/pxa25x.c
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa2xx.c
arch/arm/mach-pxa/pxa3xx.c
arch/arm/mach-pxa/reset.c
arch/arm/mach-pxa/spitz.c
arch/arm/mach-pxa/tosa.c
drivers/watchdog/sa1100_wdt.c
commit 1f4de5a0e3b4a4b8afa2cddb46429d32e1053c14
Author: Jonathan Cameron <jic23 at cam.ac.uk>
Date: Mon Aug 4 14:41:27 2008 +0100
[ARM] 5185/1: Fix spi num_chipselect for lubbock
Change num_chipselect for lubbock ssp master to reflect requirement
of spi subsystem that all buses have at least 1 chip select.
Signed-off-by: Jonathan Cameron <jic23 at cam.ac.uk>
Acked-by: Eric Miao <eric.miao at marvell.com>
Acked-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit e6fce5b916cd7f7f79b2b3e53ba74bbfc1d7cf8b
Author: Robert Olsson <robert.olsson at its.uu.se>
Date: Thu Aug 7 02:23:01 2008 -0700
pktgen: multiqueue etc.
Sofar far pktgen have had a restriction to only use one device per kernel
thread. With the new multiqueue architecture this is no longer adequate.
The patch below is an effort to remove this by in pktgen configuration
adding a tag to the device name a la eth0 at 0 etc. The tag is used for
usual device config just as before. Also a new flag is introduced to mirror
queue_map with sending threads smp_processor_id() QUEUE_MAP_CPU.
An example: We use 4 CPU's to send to one 10g interface (eth0)
and we use the new tagging to send a mix of packet sizes, 64, 576 and
1500 bytes. Also we use TX queues according to smp_processor_id()
PGDEV=/proc/net/pktgen/kpktgend_0
pgset "add_device eth0 at 0"
PGDEV=/proc/net/pktgen/kpktgend_1
pgset "add_device eth0 at 1"
PGDEV=/proc/net/pktgen/kpktgend_2
pgset "add_device eth0 at 2"
PGDEV=/proc/net/pktgen/kpktgend_3
pgset "add_device eth0 at 3"
....
PGDEV=/proc/net/pktgen/eth0 at 0
pgset "pkt_size 64"
pgset "flag QUEUE_MAP_CPU"
PGDEV=/proc/net/pktgen/eth0 at 1
pgset "pkt_size 572"
pgset "flag QUEUE_MAP_CPU"
PGDEV=/proc/net/pktgen/eth0 at 2
pgset "pkt_size 1496"
PGDEV=/proc/net/pktgen/eth0 at 3
pgset "pkt_size 1496"
pgset "flag QUEUE_MAP_CPU"
Signed-off-by: Robert Olsson <robert.olsson at its.uu.se>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 32bb93b02da8c75031e601ff1f9a25f99febbe5f
Merge: 6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718 3859069bc3358772b08bd91efe9edec39a746ea8
Author: David S. Miller <davem at davemloft.net>
Date: Thu Aug 7 02:10:27 2008 -0700
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
commit a09e64fbc0094e3073dbb09c3b4bfe4ab669244b
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Tue Aug 5 16:14:15 2008 +0100
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit a1b81a84fff05dbfef45b7012c26e1fee9973e5d
Merge: 4fb8af10d0fd09372d52966b76922b9e82bbc950 3663b736a5083b3bce74520b637f630f01f66a7f
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Thu Aug 7 09:55:16 2008 +0100
Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
commit 4fb8af10d0fd09372d52966b76922b9e82bbc950
Merge: f44f82e8a20b98558486eb14497b2f71c78fa325 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Thu Aug 7 09:55:03 2008 +0100
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
commit f44f82e8a20b98558486eb14497b2f71c78fa325
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sat Aug 2 19:36:14 2008 +0100
[ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit be509729356b7433f73df2b9a966674a437fbbc1
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Mon Aug 4 10:41:28 2008 +0100
[ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead
Remove includes of asm/hardware.h in addition to asm/arch/hardware.h.
Then, since asm/hardware.h only exists to include asm/arch/hardware.h,
update everything to directly include asm/arch/hardware.h and remove
asm/hardware.h.
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 0f8469a54f7bd65f2c740a5480c56260dc8a7ae0
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sun Aug 3 15:06:16 2008 +0100
[ARM] Eliminate useless includes of asm/mach-types.h
There are 43 includes of asm/mach-types.h by files that don't
reference anything from that file. Remove these unnecessary
includes.
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 897d85275d7f061ff0ec838bd5224a9e76ad07d6
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sun Aug 3 15:04:04 2008 +0100
[ARM] Fix circular include dependency with IRQ headers
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 3859069bc3358772b08bd91efe9edec39a746ea8
Merge: e2c709b0ba2886b5438b666222b4b3faf82d65a9 867240f7b2a37b1be4ba37d904a9064a96c82099
Author: Jeff Garzik <jeff at garzik.org>
Date: Thu Aug 7 04:05:46 2008 -0400
Merge branch 'for-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into tmp
commit e2c709b0ba2886b5438b666222b4b3faf82d65a9
Author: Krzysztof Halasa <khc at pm.waw.pl>
Date: Mon Jun 30 22:09:15 2008 +0200
WAN: remove extra help text from HDLC_PPP config option
Remove extra help text from HDLC_PPP config option.
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f982307f22db96201e41540295f24e8dcc10c78f
Author: Joe Eykholt <jre at nuovasystems.com>
Date: Wed Jul 2 18:22:02 2008 -0700
net/core: Allow receive on active slaves.
If a packet_type specifies an active slave to bonding and not just any
interface, allow it to receive frames that came in on that interface.
Signed-off-by: Joe Eykholt <jre at nuovasystems.com>
Signed-off-by: Jay Vosburgh <fubar at us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 0d7a3681232f545c6a59f77e60f7667673ef0e93
Author: Joe Eykholt <jre at nuovasystems.com>
Date: Wed Jul 2 18:22:01 2008 -0700
net/core: Allow certain receives on inactive slave.
Allow a packet_type that specifies the exact device to receive
even on an inactive bonding slave devices. This is important for some
L2 protocols such as LLDP and FCoE. This can eventually be used
for the bonding special cases as well.
Signed-off-by: Joe Eykholt <jre at nuovasystems.com>
Signed-off-by: Jay Vosburgh <fubar at us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit cc9bd5cebc0825e0fabc0186ab85806a0891104f
Author: Joe Eykholt <jre at nuovasystems.com>
Date: Wed Jul 2 18:22:00 2008 -0700
net/core: Uninline skb_bond().
Otherwise subsequent changes need multiple return values.
Signed-off-by: Joe Eykholt <jre at nuovasystems.com>
Signed-off-by: Jay Vosburgh <fubar at us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit db018a5f49e1768891221a580e59f6825c52ab7a
Author: Moni Shoua <monis at voltaire.com>
Date: Wed Jul 2 18:21:59 2008 -0700
bonding: Don't destroy bonding master when removing slave via sysfs
It is wrong to destroy a bonding master from a context that uses the sysfs
of that bond. When last IPoIB slave is unenslaved from by writing to a
sysfs file (for bond0 this would be /sys/class/net/bond0/bonding/slaves)
the driver tries to destroy the bond. This is wrong and can lead to a
lockup or a crash. This fix lets the bonding master stay and relies on
the user to destroy the bonding master if necessary (i.e. before module
ib_ipoib is unloaded)
This patch affects only bonds of IPoIB slaves. Ethernet slaves stay
unaffected.
Signed-off-by: Moni Shoua <monis at voltaire.com>
Signed-off-by: Jay Vosburgh <fubar at us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f0c76d61779b153dbfb955db3f144c62d02173c2
Author: Jay Vosburgh <fubar at us.ibm.com>
Date: Wed Jul 2 18:21:58 2008 -0700
bonding: refactor mii monitor
Refactor mii monitor. As with the previous ARP monitor refactor,
the motivation for this is to handle locking rationally (in this case,
removing conditional locking) and generally clean up the code.
This patch breaks up the monolithic mii monitor into two phases:
an inspection phase, followed by an optional commit phase. The commit phase
is the only portion that requires RTNL or makes changes to state, and is
only called when inspection finds something to change.
Signed-off-by: Jay Vosburgh <fubar at us.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718
Author: Gui Jianfeng <guijianfeng at cn.fujitsu.com>
Date: Wed Aug 6 23:50:04 2008 -0700
tcp: Fix kernel panic when calling tcp_v(4/6)_md5_do_lookup
If the following packet flow happen, kernel will panic.
MathineA MathineB
SYN
---------------------->
SYN+ACK
<----------------------
ACK(bad seq)
---------------------->
When a bad seq ACK is received, tcp_v4_md5_do_lookup(skb->sk, ip_hdr(skb)->daddr))
is finally called by tcp_v4_reqsk_send_ack(), but the first parameter(skb->sk) is
NULL at that moment, so kernel panic happens.
This patch fixes this bug.
OOPS output is as following:
[ 302.812793] IP: [<c05cfaa6>] tcp_v4_md5_do_lookup+0x12/0x42
[ 302.817075] Oops: 0000 [#1] SMP
[ 302.819815] Modules linked in: ipv6 loop dm_multipath rtc_cmos rtc_core rtc_lib pcspkr pcnet32 mii i2c_piix4 parport_pc i2c_core parport ac button ata_piix libata dm_mod mptspi mptscsih mptbase scsi_transport_spi sd_mod scsi_mod crc_t10dif ext3 jbd mbcache uhci_hcd ohci_hcd ehci_hcd [last unloaded: scsi_wait_scan]
[ 302.849946]
[ 302.851198] Pid: 0, comm: swapper Not tainted (2.6.27-rc1-guijf #5)
[ 302.855184] EIP: 0060:[<c05cfaa6>] EFLAGS: 00010296 CPU: 0
[ 302.858296] EIP is at tcp_v4_md5_do_lookup+0x12/0x42
[ 302.861027] EAX: 0000001e EBX: 00000000 ECX: 00000046 EDX: 00000046
[ 302.864867] ESI: ceb69e00 EDI: 1467a8c0 EBP: cf75f180 ESP: c0792e54
[ 302.868333] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068
[ 302.871287] Process swapper (pid: 0, ti=c0792000 task=c0712340 task.ti=c0746000)
[ 302.875592] Stack: c06f413a 00000000 cf75f180 ceb69e00 00000000 c05d0d86 000016d0 ceac5400
[ 302.883275] c05d28f8 000016d0 ceb69e00 ceb69e20 681bf6e3 00001000 00000000 0a67a8c0
[ 302.890971] ceac5400 c04250a3 c06f413a c0792eb0 c0792edc cf59a620 cf59a620 cf59a634
[ 302.900140] Call Trace:
[ 302.902392] [<c05d0d86>] tcp_v4_reqsk_send_ack+0x17/0x35
[ 302.907060] [<c05d28f8>] tcp_check_req+0x156/0x372
[ 302.910082] [<c04250a3>] printk+0x14/0x18
[ 302.912868] [<c05d0aa1>] tcp_v4_do_rcv+0x1d3/0x2bf
[ 302.917423] [<c05d26be>] tcp_v4_rcv+0x563/0x5b9
[ 302.920453] [<c05bb20f>] ip_local_deliver_finish+0xe8/0x183
[ 302.923865] [<c05bb10a>] ip_rcv_finish+0x286/0x2a3
[ 302.928569] [<c059e438>] dev_alloc_skb+0x11/0x25
[ 302.931563] [<c05a211f>] netif_receive_skb+0x2d6/0x33a
[ 302.934914] [<d0917941>] pcnet32_poll+0x333/0x680 [pcnet32]
[ 302.938735] [<c05a3b48>] net_rx_action+0x5c/0xfe
[ 302.941792] [<c042856b>] __do_softirq+0x5d/0xc1
[ 302.944788] [<c042850e>] __do_softirq+0x0/0xc1
[ 302.948999] [<c040564b>] do_softirq+0x55/0x88
[ 302.951870] [<c04501b1>] handle_fasteoi_irq+0x0/0xa4
[ 302.954986] [<c04284da>] irq_exit+0x35/0x69
[ 302.959081] [<c0405717>] do_IRQ+0x99/0xae
[ 302.961896] [<c040422b>] common_interrupt+0x23/0x28
[ 302.966279] [<c040819d>] default_idle+0x2a/0x3d
[ 302.969212] [<c0402552>] cpu_idle+0xb2/0xd2
[ 302.972169] =======================
[ 302.974274] Code: fc ff 84 d2 0f 84 df fd ff ff e9 34 fe ff ff 83 c4 0c 5b 5e 5f 5d c3 90 90 57 89 d7 56 53 89 c3 50 68 3a 41 6f c0 e8 e9 55 e5 ff <8b> 93 9c 04 00 00 58 85 d2 59 74 1e 8b 72 10 31 db 31 c9 85 f6
[ 303.011610] EIP: [<c05cfaa6>] tcp_v4_md5_do_lookup+0x12/0x42 SS:ESP 0068:c0792e54
[ 303.018360] Kernel panic - not syncing: Fatal exception in interrupt
Signed-off-by: Gui Jianfeng <guijianfeng at cn.fujitsu.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ee7af8264dafa0c8c76a8dc596803966c2e29ebc
Author: David S. Miller <davem at davemloft.net>
Date: Wed Aug 6 23:35:59 2008 -0700
pkt_sched: Fix "parent is root" test in qdisc_create().
As noticed by Stephen Hemminger, the root qdisc is denoted by
TC_H_ROOT, not zero.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c16d118537cadb21d186e35aebad90a13cd78846
Author: Wang Chen <wangchen at cn.fujitsu.com>
Date: Tue Jul 22 13:13:12 2008 +0800
[netdrvr] Drivers should not set IFF_* flag themselves
Some hardware set promisc when they are requested to set IFF_ALLMULTI flag.
It's ok, but if drivers set IFF_PROMISC flag when they set promisc,
it will broken upper layer handle for promisc and allmulti.
In addition, drivers can use their own hardware programming to make it.
So do not allow drivers to set IFF_* flags.
This is a general driver fix, so I didn't split it to pieces and send
to specific driver maintainers.
Signed-off-by: Wang Chen <wangchen at cn.fujitsu.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit fe414248551e2880fe8913577699003ff145ab9d
Author: Laurent Pinchart <laurentp at cse-semaphore.com>
Date: Wed Jul 23 17:41:52 2008 +0200
dm9000: Support MAC address setting through platform data.
The dm9000 driver reads the chip's MAC address from the attached EEPROM. When
no EEPROM is present, or when the MAC address is invalid, it falls back to
reading the address from the chip.
This patch lets platform code set the desired MAC address through platform
data.
Signed-off-by: Laurent Pinchart <laurentp at cse-semaphore.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 9a5d3414202a21ed4b053657345ea0fd492d513a
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Fri Jul 25 12:07:22 2008 -0700
3c59x: use netdev_alloc_skb
Fix possible bug where end of receive buffer could be overwritten.
The allocation needs to allow for the reserved space. This would only happen
if device received packet greater than Ethernet standard MTU.
Change this driver to use netdev_alloc_skb rather than setting skb->dev
directly. For the initial allocation it doesn't need to be GFP_ATOMIC.
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b11f8d8cc3bb2fa6fa55286babc1a5ebb2e932c4
Author: Brandon Philips <brandon at ifup.org>
Date: Tue Jul 15 02:18:41 2008 -0700
ethtool: Expand ethtool_cmd.speed to 32 bits
Introduce the speed_hi field to ethtool_cmd, using the reserved space,
to expand the speed field to 2^32 Megabits/second.
Making this field expansion now gives us plenty of time to fix up the
user-space pieces that use SIOCETHTOOL before hardware faster than 64
Gb/s is available.
Signed-off-by: Brandon Philips <bphilips at suse.de>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 4f63135eb23015a17eaf4f7478deedf63e98ff5c
Author: Ben Collins <ben.collins at canonical.com>
Date: Wed Jul 30 12:39:02 2008 -0700
pegasus: add blacklist support to fix Belkin bluetooth dongle.
Reference: https://launchpad.net/bugs/140511
The Belkin bluetooth dongle unfortunately shares the vendor and device id
with the network adapter which causes lockups whenever the bluetooth
dongle is inserted.
Signed-off-by: Stefan Bader <stefan.bader at canonical.com>
Signed-off-by: Ben Collins <ben.collins at canonical.com>
Cc: Greg Kroah-Hartman <gregkh at suse.de>
Cc: David Brownell <david-b at pacbell.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 11a859e591befae7413505c68dd241ad8e14748c
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Wed Jul 30 12:50:12 2008 -0700
drivers/net/netxen/netxen_nic_hw.c: fix printk warnings
drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_nic_pci_mem_read_direct':
drivers/net/netxen/netxen_nic_hw.c:1414: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64'
drivers/net/netxen/netxen_nic_hw.c: In function 'netxen_nic_pci_mem_write_direct':
drivers/net/netxen/netxen_nic_hw.c:1487: warning: format '%llx' expects type 'long long unsigned int', but argument 3 has type 'u64'
You don't know what type was used for u64 hence they cannot be printed without
casting.
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 5608784fdf417467cbb2ccfb1129500464416f79
Author: Eugene Teo <eugeneteo at kernel.sg>
Date: Wed Jul 30 12:38:59 2008 -0700
hamradio: add missing sanity check to tty operation
Add missing sanity check to tty operation.
Acked-by: Alan Cox <alan at redhat.com>
Signed-off-by: Eugene Teo <eteo at redhat.com>
Cc: Jeff Garzik <jeff at garzik.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 11795aa4f89cf68e7aafc8a606feee14c97a12e5
Author: Gustavo F. Padovan <gustavo at las.ic.unicamp.br>
Date: Sat Aug 2 15:55:13 2008 -0300
drivers/net: coding styles fixes to drivers/net/8390.c
Fix all errors and warnings reported by checkpatch.pl
Signed-off-by: Gustavo F. Padovan <gustavo at las.ic.unicamp.br>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit caa1687c0123705182dc0388304a4c9b78fcf41c
Author: Gustavo F. Padovan <gustavo at las.ic.unicamp.br>
Date: Sat Aug 2 15:55:12 2008 -0300
drivers/net: coding styles fixes to drivers/net/8390p.c
Fix all errors and warnings reported by checkpatch.pl
Signed-off-by: Gustavo F. Padovan <gustavo at las.ic.unicamp.br>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 057b61afca098d3ad3d9e8d15914bc9f9315e425
Author: Gustavo F. Padovan <gustavo at las.ic.unicamp.br>
Date: Sat Aug 2 15:55:11 2008 -0300
drivers/net: Remove 'return' of void function NS8390p_init()
We don't need this into a void function.
Signed-off-by: Gustavo F. Padovan <gustavo at las.ic.unicamp.br>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 71557a37adb5df17631c493b3b7d912938c720b2
Author: Yoshinori Sato <ysato at users.sourceforge.jp>
Date: Wed Aug 6 19:49:00 2008 -0400
[netdrvr] sh_eth: Add SH7619 support
Add support SH7619 Internal ethernet controler.
Signed-off-by: Yoshinori Sato <ysato at users.sourceforge.jp>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit d91d4bb9db4a7b2a78accff3560bfd42988c56e4
Author: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Date: Thu Jul 31 01:14:24 2008 +0200
METH: fix MAC address setup
Setup of the mac filter lost the upper 16bit of the mac address. This
bug got unconvered by a patch, which fixed the promiscous handling.
Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 0b1ab1b8a4f663a34c23f31d796fd08283b6077a
Author: Eduardo Habkost <ehabkost at redhat.com>
Date: Thu Jul 31 17:36:55 2008 -0300
xen-netfront: use netif_start_queue() on xennet_open()
xen-netfront never called netif_start_queue() and was was waking the
queue on xennet_open(), triggering the BUG_ON() on __netif_schedule().
Signed-off-by: Eduardo Habkost <ehabkost at redhat.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit b08c42b283141d1a79fb748d258dcd1da8baa32e
Author: root <root at susedev.(none)>
Date: Thu Jul 31 13:46:08 2008 -0700
qla3xxx: driver version change.
Signed-off-by: Ron Mercer <ron.mercer at qlogic.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 4ea0d6e5b8dc6c46c1a981e971fa0b78bfe6e5d3
Author: Ron Mercer <ron.mercer at qlogic.com>
Date: Thu Jul 31 13:46:07 2008 -0700
qla3xxx: cleanup: Remove some unused structure definitions and structure elements.
Signed-off-by: Ron Mercer <ron.mercer at qlogic.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 6bc0ed97d5ddb49248cfb76827d72557f4bd0aae
Author: Ron Mercer <ron.mercer at qlogic.com>
Date: Thu Jul 31 13:46:06 2008 -0700
qla3xxx: cleanup: Remove some unused defined constants in the header file.
Signed-off-by: Ron Mercer <ron.mercer at qlogic.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit eb115b00992ed21fb8734cbee45d46d37f4010ce
Author: Ron Mercer <ron.mercer at qlogic.com>
Date: Thu Jul 31 13:46:05 2008 -0700
qla3xxx: fix: Fix IFF_MULTICAST setting.
The driver was erroneously clearing this bit though the hardware supports multicast.
Signed-off-by: Ron Mercer <ron.mercer at qlogic.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 49ef26eb8dc76531b197b591072c403f0e6ec598
Author: Ron Mercer <ron.mercer at qlogic.com>
Date: Thu Jul 31 13:46:04 2008 -0700
qla3xxx: fix: Remove unused set_multicast function.
This device is one side of a two-function adapter (NIC and iSCSI).
Promiscuous mode setting/clearing is not allowed from the NIC side.
Signed-off-by: Ron Mercer <ron.mercer at qlogic.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 9ad27643f3a054dff9211bb9938f2323907c2ffe
Author: Dhananjay Phadke <dhananjay at netxen.com>
Date: Fri Aug 1 03:14:59 2008 -0700
netxen: fix promisc mode, mtu setting
For NX3031, multicast filtering, promisc mode, and max frame size
setting is handled by firmware, driver needs to send request to
enable/disable it.
For old chip revisions / firmware, driver still sets it directly.
Added function pointer to set mtu according to chip revision.
Signed-off-by: Dhananjay Phadke <dhananjay at netxen.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 83821a078a1617e120d76954f455204cec78fe9d
Author: Dhananjay Phadke <dhananjay at netxen.com>
Date: Fri Aug 1 03:14:58 2008 -0700
netxen: fix cmd ring init
Initialize producer and consumer indices during netdev open(), only
for old firmware/chip.
Signed-off-by: Dhananjay Phadke <dhananjay at netxen.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit d71e1be8edd355668a12a18660da03ae993dd9df
Author: Dhananjay Phadke <dhananjay at netxen.com>
Date: Fri Aug 1 03:14:57 2008 -0700
netxen: fix legacy interrupts
Fix legacy interrupt mode for NX3031 chips, read pci interrupt state
in hardware to guard against spurious interrupt.
Signed-off-by: Dhananjay Phadke <dhananjay at netxen.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ea771bd51c3b9b9683860515d93e6155a345fa2f
Author: David S. Miller <davem at davemloft.net>
Date: Wed Aug 6 23:11:08 2008 -0700
sparc64: Use kernel/uid16.c helpers instead of own copy.
Noticed by Adrian Bunk.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a70f939338cae650f177ae79562ec44659788bb4
Author: Dhananjay Phadke <dhananjay at netxen.com>
Date: Fri Aug 1 03:14:56 2008 -0700
netxen: add new board types
Add couple of new board configurations based on NX3031 chip.
Signed-off-by: Dhananjay Phadke <dhananjay at netxen.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 24a7a45511f89959b4f1dc60a66260d09777901a
Author: Dhananjay Phadke <dhananjay at netxen.com>
Date: Fri Aug 1 03:14:55 2008 -0700
netxen: fix link status, link speed
For NX3031, the phy is managed by firmware, so driver should avoid
setting any phy registers.
Signed-off-by: Dhananjay Phadke <dhananjay at netxen.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 4ad7a018cf4ac3cbad661c28c0f783ee0a6e3bf6
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Aug 4 11:59:36 2008 +0300
remove bogus CONFIG_GFAR_NAPI's
The commit that made the CONFIG_GFAR_NAPI code unconditional was
included at the same time as a new CONFIG_GFAR_NAPI user, resulting
in these bugus #ifdef's.
Reported-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 5b1c29b4365d2eaf05eb81899cb1ca847dfe026e
Author: Li Yang <leoli at freescale.com>
Date: Wed Aug 6 15:08:50 2008 +0800
net/fs_enet: remove redundant messages for performance
Currently when we do a packet flood to the Ethernet port, the console
reports error every time when a packet is dropped. This is too
redundant and cost performance. Remove message for this type of event.
Signed-off-by: Li Yang <leoli at freescale.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 9a33e883564c2db8e1b3b645de4579a98ac084d2
Author: Ayaz Abdulla <aabdulla at nvidia.com>
Date: Wed Aug 6 12:12:34 2008 -0400
forcedeth: add tx pause limit
This patch adds support for limiting the number of tx pause frames to a
default of 8. Previously, hardware would send out continuous stream of
pause frames.
Signed-off-by: Ayaz Abdulla <aabdulla at nvidia.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 06941931d8697dd939d7cac379565b1b2de1415f
Author: Ayaz Abdulla <aabdulla at nvidia.com>
Date: Wed Aug 6 12:12:18 2008 -0400
forcedeth: add jumbo frame support for mcp79
This patch adds jumbo frame support for MCP79 chipsets.
Signed-off-by: Ayaz Abdulla <aabdulla at nvidia.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 9c6624352cdba7ef4859dae44eb48d538ac78d1b
Author: Ayaz Abdulla <aabdulla at nvidia.com>
Date: Wed Aug 6 12:11:42 2008 -0400
forcedeth: add new tx stat counters
This patch adds support for new tx statistic counters in the hardware -
unicast, multicast, and broadcast
Signed-off-by: Ayaz Abdulla <aabdulla at nvidia.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 1ef6841b4c4d9cc26e53271016c1d432ea65ed24
Author: Ayaz Abdulla <aabdulla at nvidia.com>
Date: Wed Aug 6 12:11:03 2008 -0400
forcedeth: fix rx error policy
This patch enforces a stricter policy on rx errors. The driver needs to
verify whether there are multiple rx errors versus a single error.
Signed-off-by: Ayaz Abdulla <aabdulla at nvidia.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 8bad4afe1257585967a1b38cd3f21324b260812b
Merge: f71eb1a24a8cdde8d388c8f93e935aa7ac491047 3c4dc7115dfdb9e0450b7a3b0649948f5356d4af
Author: Jeff Garzik <jeff at garzik.org>
Date: Thu Aug 7 02:05:01 2008 -0400
Merge branch 'via-velocity' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu/netdev-2.6 into tmp
commit f71eb1a24a8cdde8d388c8f93e935aa7ac491047
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Mon Aug 4 13:33:37 2008 -0700
sky2: fix PM related regressions
Fix the problems reported for 2.6.27-rc1 caused by over aggressive
power management. Turning clock off on PCI Express is problematic for WOL,
and when doing multi-booting.
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit a6ef5e9d7dd6f3de4f88b68c390f0f0d7072944c
Author: Alexander Duyck <alexander.h.duyck at intel.com>
Date: Mon Aug 4 15:00:27 2008 -0700
igb: remove igb_init_managability as it is deprecated
igb_init_managability does not actually perform any function as the two
registers it attempts to write are both read only on the host. This patch
removes the function and all references to it from the driver.
Signed-off-by: Alexander Duyck <alexander.h.duyck at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit ec796b4ffc947f74e9e85198d1648e9556300c55
Author: Alexander Duyck <alexander.h.duyck at intel.com>
Date: Mon Aug 4 15:00:18 2008 -0700
igb: remove three redundant functions left in the code
Three functions were left in the code that are no longer used. I am removing
these functions just to keep the code clean.
Signed-off-by: Alexander Duyck <alexander.h.duyck at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 549bdd84dce242e15a9d7b42787ae481ba29f458
Author: Alexander Duyck <alexander.h.duyck at intel.com>
Date: Mon Aug 4 15:00:06 2008 -0700
igb: correct issue of set_mta member of mac.ops not being populated
The igb_mta_set function was not being correctly used
Signed-off-by: Alexander Duyck <alexander.h.duyck at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 726c09e7b6b7b9f9015ae7ce803ba4cd67121d67
Author: Alexander Duyck <alexander.h.duyck at intel.com>
Date: Mon Aug 4 14:59:56 2008 -0700
igb: fixes 82576 serdes init to correctly support manual flow control changes
This patch changes the PCS configuration for serdes so that the flow
control options change be set via the ethtool -A option.
Signed-off-by: Alexander Duyck <alexander.h.duyck at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit c743a87eabc50110ba5e473e707079c9b429779a
Author: Alexander Duyck <alexander.h.duyck at intel.com>
Date: Mon Aug 4 14:59:46 2008 -0700
igb: fix null pointer dereference seen with fiber NICs
With a fiber or serdes NIC installed the driver was causing a null pointer
dereference on driver unload.
Signed-off-by: Alexander Duyck <alexander.h.duyck at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 106ef2fef3778f4af2e0f796a108cc19c6114264
Author: Alexander Duyck <alexander.h.duyck at intel.com>
Date: Mon Aug 4 14:59:37 2008 -0700
igb: fix comments
The internal name was used in comments, replaced with silicon part number.
Signed-off-by: Alexander Duyck <alexander.h.duyck at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit c2ac3ef35c44195ca2b9c29275c7c6830eb2d9aa
Author: Jay Cliburn <jacliburn at bellsouth.net>
Date: Mon Aug 4 19:05:10 2008 -0500
atl1: deal with hardware rx checksum bug
The L1 hardware contains a bug that flags a fragmented IP packet
as having an incorrect TCP/UDP checksum, even though the packet
is perfectly valid and its checksum is correct. There's no way to
distinguish between one of these good packets and a packet that
actually contains a TCP/UDP checksum error, so all we can do is
allow the packet to be handed up to the higher layers and let it
be sorted out there.
Add a comment describing this condition and remove the code that
currently fails to handle what may or may not be a checksum error.
Signed-off-by: Jay Cliburn <jacliburn at bellsouth.net>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit f0f422e5735ba9f48039aa7dd4c9daa16b996c2c
Author: Bruce Allan <bruce.w.allan at intel.com>
Date: Mon Aug 4 17:21:53 2008 -0700
e1000e: remove inapplicable test for ioport
There are currently no devices supported by the e1000e driver which need
ioport resources, remove the test for it and all unnecessary code
associated with it (struct e1000_adapter elements, local variables, etc.)
Signed-off-by: Bruce Allan <bruce.w.allan at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit c43bc57e5d72932b5e64bc5e4e7741bedbcaaf5f
Author: Jesse Brandeburg <jesse.brandeburg at intel.com>
Date: Mon Aug 4 17:21:40 2008 -0700
e1000e: fix drv load issues
a few people seem to have problems maintaining gigabit link
and it was root caused to an interaction between the managability
firmware on the host and the driver, not communicating.
The form of communication they use is the drv_load bit.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 10aa4c0447c308738dade244e23036f2fcbfb140
Author: Auke Kok <auke-jan.h.kok at intel.com>
Date: Mon Aug 4 17:21:20 2008 -0700
e1000e: perform basic 82573 EEPROM checks for known issues
82573 EEPROMs have been shipped out with known issues. While most
people will never see the issues some people do and we know
how to address them. Warn the user if we find one of these
EEPROM issues.
Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 44defeb3f6f98ea9bb48a2fe6eb9004e9e1a49a1
Author: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Date: Mon Aug 4 17:20:41 2008 -0700
e1000e: convert ndev_ printks to something smaller
The ndev_* printk's are too lenghty and we don't need to specify
the adapter/netdev struct at all, making this a lot more readable.
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher at intel.com>
Signed-off-by: Auke Kok <auke-jan.h.kok at intel.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 77970ea50b8e7ee9733a6589bf61ed9c02f20ee9
Author: Brice Goglin <brice at myri.com>
Date: Wed Aug 6 16:15:23 2008 +0200
myri10ge: set 64bits consistent DMA mask
Set 64bits consistent DMA mask since it improves performance
in some cases. No need to check the return value since it is
not required for the driver to work.
Signed-off-by: Brice Goglin <brice at myri.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 6a4c4ad2f0aa331324649579649c5d9064893079
Author: Brice Goglin <brice at myri.com>
Date: Wed Aug 6 16:14:43 2008 +0200
myri10ge: update firmware headers
Update myri10ge firmware headers.
Signed-off-by: Brice Goglin <brice at myri.com>
Signed-off-by: Jeff Garzik <jgarzik at redhat.com>
commit 58750139001bae11a1f9b074f3a9c774fecf5ba8
Author: Greg Ungerer <gerg at uclinux.org>
Date: Thu Jul 31 14:38:07 2008 +1000
Move all of include/asm-m68knommu to arch/m68knommu/include/asm.
With the current kbuild infrastructure in place no other changes
are required for this to work.
Signed-off-by: Greg Ungerer <gerg at uclinux.org>
commit f780a9f119caa48088b230836a7fa73d1096de7c
Author: Yevgeny Petrilin <yevgenyp at mellanox.co.il>
Date: Wed Aug 6 20:14:06 2008 -0700
mlx4_core: Add ethernet fields to CQE struct
Add ethernet-related fields to struct mlx4_cqe so that the mlx4_en
ethernet NIC driver can share the same definition.
Signed-off-by: Yevgeny Petrilin <yevgenyp at mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 685d87f7ccc649ab92b55e18e507a65d0e694eb9
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Aug 6 19:24:47 2008 -0700
Revert "pcm_native.c: remove unused label"
This reverts commit 680db0136e0778a0d7e025af7572c6a8d82279e2. The label
is actually used, but hidden behind CONFIG_SND_DEBUG and the horrible
snd_assert() macro.
That macro could probably be improved to be along the lines of
#define snd_assert(expr, args...) do { if ((void)(expr),0) { args; } } while (0)
or similar to make sure that we always both evaluate 'expr' and parse
'args', but while gcc should optimize it all away, I'm too lazy to
really verify that. So I'll just admit defeat and will continue to live
with the annoying warning.
Noted-by: Robert P. J. Day <rpjday at crashcourse.ca>
Signed-off-by: Linus "Grr.." Torvalds
commit 11d46123bfea068a48483f00518d301f452647fb
Author: David S. Miller <davem at davemloft.net>
Date: Wed Aug 6 18:30:43 2008 -0700
ipv4: Fix over-ifdeffing of ip_static_sysctl_init.
Noticed by Paulius Zaleckas.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f8d91faff3bb82c7026d6a2a5c97ee7d88bc0229
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Wed Aug 6 18:14:28 2008 -0700
of/sparc: remove include of linux/of_platform.h from asm/of_platform.h
Now that we have removed all inclusions of asm/of_platform.h, this
compatability include can be removed.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f99e8f277f1172c49ac7b0585aed5b094fe235d4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Aug 6 17:36:23 2008 -0700
iSeries: Fix up viotty_ioctl BKL locking fallout
The bogus code to call into the n_tty layer got removed in commit
8bc5fb6abb670fa9079cd1994f016a39f99698fe ("Remove bogons from the
iSeries console"), but it left a now uninitialized "return ret;" around.
Not that this code has ever even compiled since the BKL pushdown, since
not only is "ret" no longer initialized, it was never actually declared
even originally.
Replace it with a "return -ENOIOCTLCMD"
Pointed-out-by: Paul Mackerras <paulus at samba.org>
Acked-by: Alan Cox <alan at lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 0510eeb7367aca017c6320d04cfd9cbc3b5dd992
Author: Jeff Layton <jlayton at redhat.com>
Date: Sat Aug 2 07:26:12 2008 -0400
turn cifs_setattr into a multiplexor that calls the correct function
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit feb3e20cee25729447e1abdcb40c040b691d457a
Author: Jeff Layton <jlayton at redhat.com>
Date: Sat Aug 2 07:26:12 2008 -0400
move file time and dos attribute setting logic into new function
Break up cifs_setattr further by moving the logic that sets file times
and dos attributes into a separate function. This patch also refactors
the logic a bit so that when the file is already open then we go ahead
and do a SetFileInfo call. SetPathInfo seems to be unreliable when
setting times on open files.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 3fe5c1dd0a8bf3756c447a28a578593176949d1d
Author: Jeff Layton <jlayton at redhat.com>
Date: Sat Aug 2 07:26:12 2008 -0400
spin off cifs_setattr with unix extensions to its own function
Create a new cifs_setattr_unix function to handle a setattr when unix
extensions are enabled and have cifs_setattr call it. Also, clean up
variable declarations in cifs_setattr.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 680db0136e0778a0d7e025af7572c6a8d82279e2
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Aug 6 15:14:13 2008 -0700
pcm_native.c: remove unused label
This fixes the warning
sound/core/pcm_native.c: In function 'snd_pcm_fasync':
sound/core/pcm_native.c:3262: warning: label 'out' defined but not used
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 816d8c6a2580562698cf0fa0b9e5b4dd570e636e
Author: Andrew Paprocki <andrew at ishiboo.com>
Date: Wed Aug 6 22:41:06 2008 +0200
hwmon: (it87) Support for 16-bit fan reading in it8705 >= rev 0x03
The it8705 chip supports 16-bit fan tachometers in revisions at least
>= 0x03 (Version G). This patch enables 16-bit fan readings on all
revisions >= 0x03 just like the it8712, it8716, and it8718 chips.
Signed-off-by: Andrew Paprocki <andrew at ishiboo.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 0475169c13e177e1af5a02f5e9f30fda13dc0b86
Author: Andrew Paprocki <andrew at ishiboo.com>
Date: Wed Aug 6 22:41:06 2008 +0200
hwmon: (it87) Support for 16-bit fan reading in it8712 >= rev 0x07
The it8712 chip supports 16-bit fan tachometers in revisions >= 0x07.
Revisions >= 0x08 dropped support for 8-bit fan divisor registers. The
patch enables 16-bit fan readings on all revisions >= 0x07 just like
the it8716 and it8718 chips.
Signed-off-by: Andrew Paprocki <andrew at ishiboo.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 116d0486bdefc11f71e567cadf0c47f788b4dd06
Author: Frank Myhr <fmyhr at fhmtech.com>
Date: Wed Aug 6 22:41:06 2008 +0200
hwmon: (hwmon-vid) Add 6-bit vid codes for AMD NPT 0Fh cpus
AMD NPT 0Fh cpus use 6 bit VID codes. Successive codes with msb 0
describe 25mV decrements, while those with msb 1 describe 12.5mV
decrements. Existing hwmon-vid.c is correct only for codes with msb 0;
add support for the codes with msb 1.
Ref:
p 309, Table 71
AMD Publication 32559, BIOS and Kernel Developer's Guide for AMD NPT Family 0Fh Processors
http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf
Signed-off-by: Frank Myhr <fmyhr at fhmtech.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 15872212e876de9ae404108e4ad231a645b55b54
Author: Frank Myhr <fmyhr at fhmtech.com>
Date: Wed Aug 6 22:41:06 2008 +0200
hwmon: (hwmon-vid) Trivial format multi-line comments per CodingStyle
Signed-off-by: Frank Myhr <fmyhr at fhmtech.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 6c633c3025c75f5fcf3a76d375faff34e3be021b
Author: Sean MacLennan <seanm at seanm.ca>
Date: Wed Aug 6 22:41:05 2008 +0200
hwmon: ad7414 driver
Driver for the Analog Devices AD7414 temperature monitoring chip.
Signed-off-by: Sean MacLennan <smaclennan at pikatech.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 84f768c1633cfc547d82b9dc671ffea2f3785542
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Wed Aug 6 22:41:05 2008 +0200
hwmon: (thmc50) Add support for critical temperature limits
Add critical temperature limits to the driver. These limits are read
only.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 68f823de3f1916cc0694376330c08377706b877d
Author: Grant Coady <gcoady.lk at gmail.com>
Date: Wed Aug 6 22:41:05 2008 +0200
hwmon: (adm9240) Remove EXPERIMENTAL dependency
The adm9240 driver is in the kernel for three years now, time to
remove the EXPERIMENTAL dependency.
Signed-off-by: Grant Coady <gcoady.lk at gmail.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 2f8ea97a45e9db382787dd7afa7f500ee661aa7b
Author: Jean Delvare <khali at linux-fr.org>
Date: Wed Aug 6 22:41:04 2008 +0200
hwmon: (w83627hf) Drop reset module parameter
Drop the reset parameter of the w83627hf driver. It seems it wasn't
that useful. It was dropped from the Linux 2.4 version of this driver
back in July 2004.
The only users who have reported that they were still using this
parameter, needed it to switch the chip from automatic fan speed
control back to manual mode. Now that the driver creates pwmN_enable
sysfs files, users will be able to use these files instead, which is
way less agressive.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Dominik Geyer <dominik.geyer at gmx.de>
commit a95a5ed856e902e513119d4cc5b745faa202f761
Author: Dominik Geyer <dominik.geyer at gmx.de>
Date: Wed Aug 6 22:41:04 2008 +0200
hwmon: (w83627hf) Add pwm_enable sysfs interface
Adds support for pwm_enable sysfs interface for the w83627hf driver.
Signed-off-by: Dominik Geyer <dominik.geyer at gmx.de>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit ad02ad85cf221c9a0574b48516762e37cceca0da
Author: Marc Hulsman <m.hulsman at tudelft.nl>
Date: Wed Aug 6 22:41:04 2008 +0200
hwmon: (w83791d) Use fan divisor bits from vbat register
Update w83791d with fan bits in vbat mon register (7.48 of the
datasheet). This change allows all fans to have a divisor of 128,
and fixes a problem with incorrectly reported fan speeds.
Signed-off-by: Marc Hulsman <m.hulsman at tudelft.nl>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 05a5e477687ac7a22c0791b3e899ed7d539f7b95
Author: Jean Delvare <khali at linux-fr.org>
Date: Wed Aug 6 22:41:04 2008 +0200
hwmon: (f71882fg) Delete needless forward declarations
These functions aren't used before being defined, so there's no point
in forward-declaring them.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Hans de Goede <j.w.r.degoede at hhs.nl>
commit 549edb83327f2a5027a22d65b10603b01dc40175
Author: Juerg Haefliger <juergh at gmail.com>
Date: Wed Aug 6 22:41:03 2008 +0200
hwmon: (dme1737) Add support for the SMSC SCH5027
Add support for the SCH5027. The differences to the DME1737 are:
- No support for programmable temp offsets
- In auto mode, PWM outputs stay on min value if temp goes below low threshold
and can't be programmed to fully turn off
- Different voltage scaling
- No VID input
Signed-off-by: Juerg Haefliger <juergh at gmail.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 55d68d75ab00e60953f8784af5927b60967a297f
Author: Juerg Haefliger <juergh at gmail.com>
Date: Wed Aug 6 22:41:03 2008 +0200
hwmon: (dme1737) Skip detection if forced
Skip the checking of the device ID register in the hwmon register
block if the force_id option is used.
Signed-off-by: Juerg Haefliger <juergh at gmail.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 73ce48f6c6b9d9dcf6a2bba0bcde39ede76809f0
Author: Juerg Haefliger <juergh at gmail.com>
Date: Wed Aug 6 22:41:03 2008 +0200
hwmon: (dme1737) Cleanups
Fix names of attribute structs to make them more consistent with the
rest of the code. Minor comment changes.
Signed-off-by: Juerg Haefliger <juergh at gmail.com>
Signed-off-by: Jean Delvare <khali at linux-fr.org>
commit 970a8a513c30a1c3e8995609a153658a34bc02bf
Author: Geert Uytterhoeven <geert at linux-m68k.org>
Date: Wed Aug 6 22:19:39 2008 +0200
m68k/amiserial: fix fallout of tty break handling rework
commit 9e98966c7bb94355689478bc84cc3e0c190f977e (tty: rework break handling)
forgot to update one exit point of rs_break() in the Amiga serial driver.
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7944d3a5a70ee5c1904ed1e8b1d71ff0af2854d9
Author: Wim Van Sebroeck <wim at iguana.be>
Date: Wed Aug 6 20:19:41 2008 +0000
[WATCHDOG] more coding style clean-up's
More coding style clean-up's.
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc
Author: Denis ChengRq <crquan at gmail.com>
Date: Mon Aug 4 09:51:40 2008 +0800
kbuild: a better way to generate cscope database change
It's a problem about cscope target of kernel Makefile, and the cscope
plugin of emacs:
1. `make cscope` will generate cscope.files cscope.{in,po,}.out;
2. the cscope plugin expect a cscope.out.{in,po,};
3. the default `cscope -b` would generate cscope.{in,po,}.out;
There are three approach to solve it:
1. modify the cscope C code;
2. modify the cscope emacs plugin lisp code;
3. modify the Makefile;
I have tried to communicate with the cscope upstream, but later I
realize the third approach is most meaningful.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 0b0de144333fca335a0111a6f9c59176ad43ba0a
Author: Robert P. J. Day <rpjday at crashcourse.ca>
Date: Mon Aug 4 13:31:32 2008 -0400
Kconfig: Extend "menuconfig" for modules to simplify Kconfig file
Given that the init/Kconfig file uses a "menuconfig" directive for
modules already, might as well wrap all the submenu entries in an "if"
to toss all those dependencies.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 0758416325dc75e203ab974aa5e937bef7d2afef
Author: Erkki Lintunen <ebirdie at iki.fi>
Date: Wed Aug 6 22:11:33 2008 +0200
bugfix for scripts/patch-kernel in 2.6 sublevel stepping
scripts/patch-kernel script can't patch a tree, say, from 2.6.25 to
2.6.26.1, because of a wrong comparison in context of patching 2.6.x base.
Fix it.
Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
commit 7a48bdd01b5cab9c043b4d42a3f377624d6259f2
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Wed Aug 6 21:56:53 2008 +0200
kbuild: fix O=.. build with arm
With a make O=... build kbuild would only create
the include2/asm symlink for archs that not yet
had moved headers to include/$ARCH/include
There is no longer any reason to avoid the symlink
for archs that has moved their headers so create it
unconditionally.
This fixes arm because kbuild checked for include/asm-$ARCH/errno.h
and that file was not present for arm but the platform files
are not yet moved.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Russell King <rmk at arm.linux.org.uk>
commit 2e4f40d2eb763a17c75c07fff605402737260c59
Merge: d6606683a5e3dac35cb979c7195f54ed827567bd e34a8ae79056e6cea4a1ac21119ee3c91f378f99
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Aug 6 12:07:36 2008 -0700
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
async_tx: fix missing braces in async_xor_zero_sum
commit d6606683a5e3dac35cb979c7195f54ed827567bd
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Aug 6 12:04:54 2008 -0700
Revert duplicate "mm/hugetlb.c must #include <asm/io.h>"
This reverts commit 7cb93181629c613ee2b8f4ffe3446f8003074842, since we
did that patch twice, and the problem was already fixed earlier by
78a34ae29bf1c9df62a5bd0f0798b6c62a54d520.
Reported-by: Andi Kleen <andi at firstfloor.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a14ad05f47b55ea84136eb4da43ea96fa469326a
Merge: 0016fe9d8a1ca99a4642735f41a7753d7c1f7e2b 8401d92ba46a1e859464cbd9c9ee304f6e361da3
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Aug 6 12:03:43 2008 -0700
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: Preserve response data alignment bug when it is harmless
commit 0016fe9d8a1ca99a4642735f41a7753d7c1f7e2b
Merge: 8bc5fb6abb670fa9079cd1994f016a39f99698fe bcbd2b65868213c1426654304de3da330cde6b3a
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Wed Aug 6 11:46:39 2008 -0700
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Update generic config
[IA64] Fix uniprocessor build w.r.t. SGI_XP and SGI_GRU
[IA64] Eliminate trailing backquote in IA64_SGI_UV
[IA64] update generic_defconfig to support sn2.
[IA64] update generic_defconfig for 2.6.27-rc1
[IA64] Allow ia64 to CONFIG_NR_CPUS up to 4096
[IA64] Cleanup generated file not ignored by .gitignore
[IA64] pv_ops: fix ivt.S paravirtualization
commit 8bc5fb6abb670fa9079cd1994f016a39f99698fe
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Wed Aug 6 14:06:29 2008 +0100
Remove bogons from the iSeries console
The iSeries driver calls into the n_tty ldisc code directly for some
bizarre reason. I previously tagged this with a query but this actually
does need fixing as n_tty methods when you have a different ldisc set are
not a good thing to call.
In n_tty mode this change should have no effect, the core tty layer has
always called the ldisc ioctl method *anyway* and will call the one for
the right ldisc.
Signed-off-by: Alan Cox <alan at redhat.com>
Acked-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3a35c27ac68cea19c252e127ec61099648eb4870
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Wed Aug 6 10:08:56 2008 -0700
docbook: fix v4l fatal filename error
docproc: /var/linsrc/lin2627-rc2/drivers/media/video/videodev.c: No such file or directory
make[1]: *** [Documentation/DocBook/videobook.xml] Error 1
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
cc: mchehab at infradead.org
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 12b7a1523eda9cd72362fdda928ddb995ecdc06d
Author: Wim Van Sebroeck <wim at iguana.be>
Date: Fri Jul 18 19:59:48 2008 +0000
[WATCHDOG] sbc8360.c - move stop code into a function
Move the sbc8360.c watchdog stop code into a seperate function.
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 0c06090c9472db0525cb6fe229c3bea33bbbbb3c
Author: Wim Van Sebroeck <wim at iguana.be>
Date: Fri Jul 18 11:41:17 2008 +0000
[WATCHDOG] Coding style - Indentation - part 2
This brings the watchdog drivers into line with coding style.
This patch takes cares of the indentation as described in chapter 1.
Main changes:
* Re-structure the ioctl switch call for all drivers as follows:
switch (cmd) {
case WDIOC_GETSUPPORT:
case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS:
case WDIOC_GETTEMP:
case WDIOC_SETOPTIONS:
case WDIOC_KEEPALIVE:
case WDIOC_SETTIMEOUT:
case WDIOC_GETTIMEOUT:
case WDIOC_GETTIMELEFT:
default:
}
This to make the migration from the drivers to the uniform watchdog
device driver easier in the future.
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 5eb82498e3a6da8a979c48945e3c1a85c10ccc25
Author: Wim Van Sebroeck <wim at iguana.be>
Date: Thu Jul 17 18:08:47 2008 +0000
[WATCHDOG] Coding style - Indentation - part 1
This brings the watchdog drivers into line with coding style.
This patch takes cares of the indentation as described in chapter 1:
The preferred way to ease multiple indentation levels in a switch
statement is to align the "switch" and its subordinate "case"
labels in the same column instead of "double-indenting" the "case"
labels.
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 0d7b101404f7bedcf3f448c1667c3744551cd9ee
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Thu Jul 3 23:51:36 2008 -0700
[WATCHDOG] mpc8xxx_wdt: add support for MPC8xx watchdogs
The mpc8xxx_wdt driver is using two registers: SWSRR to push magic
numbers, and SWCRR to control the watchdog. Both registers are available
on the MPC8xx, and seem to have the same offsets and semantics as in
MPC83xx/MPC86xx watchdogs. The only difference is prescale value. So
this driver simply works on the MPC8xx CPUs.
One quirk is needed for the MPC8xx, though. It has small prescale value
and slow CPU, so the watchdog resets board prior to the driver has time to
load. To solve this we should split initialization in two steps: start
ping the watchdog early, and register the watchdog userspace interface
later.
MPC823 seem to be the first CPU in MPC8xx line, so we use fsl,mpc823-wdt
compatible matching.
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Tested-by: Jochen Friedrich <jochen at scram.de>
Cc: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit cb55d282a0d2156e7d40ee81726ab16b569e96d7
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Thu Jul 3 23:51:36 2008 -0700
[WATCHDOG] mpc8xxx_wdt: fix build
CC drivers/watchdog/mpc8xxx_wdt.o
drivers/watchdog/mpc8xxx_wdt.c: In function 'mpc8xxx_wdt_ioctl':
drivers/watchdog/mpc8xxx_wdt.c:156: error: 'cmd' undeclared (first use in this function)
drivers/watchdog/mpc8xxx_wdt.c:156: error: (Each undeclared identifier is reported only once
drivers/watchdog/mpc8xxx_wdt.c:156: error: for each function it appears in.)
drivers/watchdog/mpc8xxx_wdt.c: At top level:
drivers/watchdog/mpc8xxx_wdt.c:176: warning: initialization from incompatible pointer type
This patch ought to be folded into
mpc8xxx_wdt-various-renames-mostly-s-mpc83xx-mpc8xxx-g.patch
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Cc: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit 59ca1b0d14ca71bdefef372ccd5035341e0ca091
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Thu Jul 3 23:51:35 2008 -0700
[WATCHDOG] mpc8xxx_wdt: various renames, mostly s/mpc83xx/mpc8xxx/g
mpc83xx_wdt.c renamed to mpc8xxx_wdt.c, now we can do various renames in
the file itself.
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Cc: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit 28acd02f9f9efe44718de3bbe8be22d6dfb7e47f
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Thu Jul 3 23:51:34 2008 -0700
[WATCHDOG] mpc83xx_wdt: rename to mpc8xxx_wdt
Rename the driver because now we support some MPC86xx processors.
There are no changes to the mpc83xx_wdt.c file, yet. When possible, we do
file renames and changes separately (because Linus once asked so, because
it helps git to track the renamed files).
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Cc: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit 500c919e3d699644cc9d6c1e93022481baafd8e1
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Thu Jul 3 23:51:34 2008 -0700
[WATCHDOG] mpc83xx_wdt: add support for MPC86xx CPUs
On MPC86xx the watchdog could be enabled only at power-on-reset, and could
not be disabled afterwards. We must ping the watchdog from the kernel
until the userspace handles it.
MPC83xx CPUs are only differ in a way that watchdog could be disabled
once, but after it was enabled via software it becomes just the same as
MPC86xx.
Thus, to support MPC86xx I added the kernel timer which pings the watchdog
until the userspace opens it.
Since we implemented the timer, now we're able to implement proper
handling for the CONFIG_WATCHDOG_NOWAYOUT case, for MPC83xx and MPC86xx.
Also move the probe code into subsys_initcall, because we want start
pinging the watchdog ASAP, and misc devices are available in
subsys_initcall.
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Cc: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit ef8ab12ec2d663f9b146c920a4dd589a7e767f2d
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Thu Jul 3 23:51:32 2008 -0700
[WATCHDOG] mpc83xx_wdt: convert to the OF platform driver
This patch simply converts mpc83xx_wdt to the OF platform driver so we can
directly work with the device tree without passing various stuff through
platform data.
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Acked-by: Stephen Rothwell <sfr at canb.auug.org.au>
Cc: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit c9488520512df659ad21df5d100b52fed96bdf07
Author: Alan Cox <alan at redhat.com>
Date: Thu Jul 3 23:51:32 2008 -0700
[WATCHDOG] pcwd: a couple of watchdogs escaped conversion
Fix them up. Once we know the long term plan the watchdogs can all get
shrunk massively anyway
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit 089ab0791d127e8ada526c4b4d18b7584be8acf0
Author: Wim Van Sebroeck <wim at iguana.be>
Date: Tue Jul 15 11:46:11 2008 +0000
[WATCHDOG] Clean-up includes
Use #include <linux/io.h> instead of <asm/io.h>
Use #include <linux/uaccess.h> instead of <asm/uaccess.h>
Clean-up includes.
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 9e74114d96bb5dbaa17b9292139b0c6205e0b971
Author: Wim Van Sebroeck <wim at iguana.be>
Date: Tue Jul 15 11:18:04 2008 +0000
[WATCHDOG] hpwdt.c - fix double includes
The last clean-up created 2 times the same include. delete the doubles.
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 96e2e6fafaedd83bd899f682907e14d1eec17390
Merge: 0967d61ea0d8e8a7826bd8949cd93dd1e829ac55 7c4be5aa8dce9ba37fdd971d5560490d9e30c270
Author: Wim Van Sebroeck <wim at iguana.be>
Date: Wed Aug 6 11:58:26 2008 +0000
[WATCHDOG] Merge code clean-up's from Alan Cox.
Merge branch 'alan' of ../linux-2.6-watchdog-mm
Fixed Conflicts in the following files:
drivers/watchdog/booke_wdt.c
drivers/watchdog/mpc5200_wdt.c
drivers/watchdog/sc1200wdt.c
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 62aa0054da220b8bbe6f23c0eb1d97a99005d0b3
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Aug 4 11:59:05 2008 +0200
xen-blkfront.c: make blkif_ioctl() static
This patch makes the needlessly global blkif_ioctl() static.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge at citrix.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 1ac0ae062cecd37587f5b951089f90e1d9d91769
Author: Denis ChengRq <crquan at gmail.com>
Date: Mon Aug 4 11:56:30 2008 +0200
bio: make use of bvec_nr_vecs
Since introduced in 7ba1ba12eee, it should be made use of.
Signed-off-by: Denis ChengRq <crquan at gmail.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit ba198efb5ef4e5f4927a18ff95a58f40c58cbaa9
Author: Mike Miller <mike.miller at hp.com>
Date: Mon Aug 4 11:54:55 2008 +0200
cciss: fix bug if scsi tape support is disabled
Bug fix. If SCSI tape support is turned off we get an implicit declaration
of cciss_unregister_scsi error in cciss_remove_one.
Signed-off-by: Mike Miller <mike.miller at hp.com>
Signed-off-by: Stephen M. Cameron <scameron at beardog.cca.cpqcorp.net>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 935dc8d7575e6c1292b057e39045a40f1fbe26e7
Author: Mike Miller <mike.miller at hp.com>
Date: Mon Aug 4 11:54:54 2008 +0200
cciss: add support for multi lun tape devices
This patch adds support for multi-lun devices in a SAS environment. It's
required for the support of media changers.
Signed-off-by: Stephen M. Cameron <scameron at beardog.cca.cpqcorp.net>
Signed-off-by: Mike Miller <mike.miller at hp.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit f4a93bcda74edfe6977dcf296ed8c86119638871
Author: Mike Miller <mike.miller at hp.com>
Date: Mon Aug 4 11:54:53 2008 +0200
cciss: change the way we notify scsi midlayer of tape drives
This patch changes way we notify the scsi layer that something has changed
on the SCSI tape side of the driver. The user can now just tell the driver
to rescan a particular controller rather than having to know the SCSI nexus
to echo into the SCSI mid-layer.
Signed-off-by: Stephen M. Cameron <scameron at beardog.cca.cpqcorp.net>
Signed-off-by: Mike Miller <mike.miller at hp.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit eece695f8bf9d1aacf3a119ab8e21db31948e40b
Author: Mike Miller <mike.miller at hp.com>
Date: Mon Aug 4 11:54:53 2008 +0200
cciss: fix negative logical drive count in procfs
This patch fixes a problem where the logical volume count may go negative.
In some instances if several logical are configured on a controller and all
of them are deleted using the online utilities the volume count in /proc may
go negative with no way get it correct again.
Signed-off-by: Stephen M. Cameron <scameron at beardog.cca.cpqcorp.net>
Signed-off-by: Mike Miller <mike.miller at hp.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 6ae5ce8e8d4de666f31286808d2285aa6a50fa40
Author: Mike Miller <mike.miller at hp.com>
Date: Mon Aug 4 11:54:52 2008 +0200
cciss: remove redundant code
This patch removes redundant code where ever logical volumes are added or
removed. It adds 3 new functions that are called instead of having the same
code spread throughout the driver. It also removes the cciss_getgeometry
function.
The patch is fairly complex but we haven't figured out how to make it any
simpler and still do everything that needs to be done. Some of the
complexity comes from having to special case booting from cciss. Otherwise
the gendisk doesn't get added in time and the switchroot will fail.
Signed-off-by: Stephen M. Cameron <scameron at beardog.cca.cpqcorp.net>
Signed-off-by: Mike Miller <mike.miller at hp.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit a72da29b6cbc5cf918567f2a0d76df6871e94b01
Author: Mike Miller <mike.miller at hp.com>
Date: Mon Aug 4 11:54:51 2008 +0200
cciss: make rebuild_lun_table behave better
This patch makes the rebuild_lun_table smart enough to not rip a logical
volume out from under the OS. Without this fix if a customer is running
hpacucli to monitor their storage the driver will blindly remove and re-add
the disks whenever the utility calls the CCISS_REGNEWD ioctl. Unfortunately,
both hpacucli and ACUXE call the ioctl repeatedly. Customers have reported
IO coming to a standstill. Calling the ioctl is the problem, this patch is
the fix.
Signed-off-by: Stephen M. Cameron <scameron at beardog.cca.cpqcorp.net>
Signed-off-by: Mike Miller <mike.miller at hp.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit f7108f91cdcaca07c6a99777b2724093294f36ee
Author: Nikanth Karthikesan <knikanth at suse.de>
Date: Mon Aug 4 10:56:07 2008 +0200
cciss: return -EFAULT if copy_from_user() fails
Return -EFAULT instead of -ENOMEM if copy_from_user() fails.
Signed-off-by: Nikanth Karthikesan <knikanth at suse.de>
Acked-by: Mike Miller <mike.miller at hp.com>
Signed-off-by: Jens Axboe <jens.axboe at oracle.com>
commit 04793dd041bbb88a39b768b714c725de2c339b51
Author: Laurent Pinchart <laurent.pinchart at skynet.be>
Date: Thu Jul 31 17:11:12 2008 -0300
V4L/DVB (8617): uvcvideo: don't use stack-based buffers for USB transfers.
Data buffers on the stack are not allowed for USB I/O. Use dynamically
allocated buffers instead.
Signed-off-by: Bruce Schmid <duck at freescale.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart at skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 835f09c6594aa98cbfae05c5466a81fda3081d2c
Author: Laurent Pinchart <laurent.pinchart at skynet.be>
Date: Wed Jul 30 18:54:48 2008 -0300
V4L/DVB (8616): uvcvideo: Add support for two Bison Electronics webcams
The Bison Electronics 5986:0300 and 5986:0303 webcams require the
UVC_QUIRK_PROBE_MINMAX quirk.
Signed-off-by: Laurent Pinchart <laurent.pinchart at skynet.be>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 3f6ac497b036533d1a63ba04fdbe710c55e14cda
Author: Robert Jarzmik <robert.jarzmik at free.fr>
Date: Sat Aug 2 07:10:04 2008 -0300
V4L/DVB (8611): Add suspend/resume to pxa_camera driver
PXA suspend switches off DMA core, which loses all context
of previously assigned descriptors. As pxa_camera driver
relies on DMA transfers, setup the lost descriptors on
resume and retrigger frame acquisition if needed.
Signed-off-by: Robert Jarzmik <robert.jarzmik at free.fr>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 2e521061db61a35dd64ea85a1642f9a9dfde2872
Author: Robert Jarzmik <robert.jarzmik at free.fr>
Date: Fri Aug 1 20:14:50 2008 -0300
V4L/DVB (8610): Add suspend/resume capabilities to soc_camera.
Add suspend/resume hooks to call soc operation specific
suspend and resume functions. This ensures the camera
chip has been previously resumed, as well as the camera
bus.
These hooks in camera chip drivers should save/restore
chip context between suspend and resume time.
Signed-off-by: Robert Jarzmik <robert.jarzmik at free.fr>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 01c1e4ca8ec39d21be0cd9d1b300d479de97298a
Author: Paul Mundt <lethal at linux-sh.org>
Date: Fri Aug 1 19:48:51 2008 -0300
V4L/DVB (8609): media: Clean up platform_driver_unregister() bogosity.
So, platform_driver_unregister() doesn't actually have a return value,
nor do any of the void __exit routines. It's reassuring to know that
people copy and paste blindly. This completely blew up my compiler.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit d483b730681fa527f343dcc859185e06d60ae121
Author: Robert Lowery <rglowery at exemail.com.au>
Date: Wed Jul 30 19:43:11 2008 -0300
V4L/DVB (8607): cxusb: fix OOPS and broken tuning regression on FusionHDTV Dual Digital 4
quoting Robert Lowery:
I think I've found the cause of the oops.
[...]
BTW it appears I have fixed my tuning problems with the updated patch
below. This reverts a change Mauro made a while back.
All is good now :)
[...]
The good news is that I've got a better patch that definitely works this
time and even better, makes use of the standard firmware (rather than
the Australian specific one).
...based on an earlier patch by Hans-Frieder Vogt:
http://www.linuxtv.org/pipermail/linux-dvb/2008-May/026280.html
Signed-off-by: Robert Lowery <rlowery at exemail.com.au>
Signed-off-by: Michael Krufky <mkrufky at linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit fcf5cb2406827fc9d3f3fe260ac883ef72b8bac0
Author: Rabin Vincent <rabin at rab.in>
Date: Sun Aug 3 07:58:54 2008 -0300
V4L/DVB (8605): gspca: Fix of gspca_zc3xx oops - 2.6.27-rc1
Bad mini/max check in setting control values (the gamma in
zc3xx could be set to null).
Signed-off-by: Rabin Vincent <rabin at rab.in>
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit cebf3b67f7f80fd69bd1ff5787fee69ab8fd3c2a
Author: Jean-Francois Moine <moinejf at free.fr>
Date: Sun Aug 3 07:52:53 2008 -0300
V4L/DVB (8604): gspca: Fix of "scheduling while atomic" crash.
The crash is due to USB exchanges done at interrupt level.
These exchanges, tied to autogain, are now done by the application.
Also, there is a fix about autogain start.
Concerned subdrivers: etoms, pac7311, sonixj and spca561.
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 594f5b8b3cce6d3137ebf260b7386520b2534385
Author: Jean-Francois Moine <moinejf at free.fr>
Date: Fri Aug 1 06:37:51 2008 -0300
V4L/DVB (8602): gspca: Fix small bugs, simplify and cleanup ov519.
The hflip and vflip controls work for ov519 - ov7670 only.
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit a674a3b492d8085fd02ee49ed11cb42c63f0f71a
Author: Eugeniy Meshcheryakov <eugen at debian.org>
Date: Fri Aug 1 08:23:41 2008 -0300
V4L/DVB (8582): set mts_firmware for em2882 based Pinnacle Hybrid Pro
Pinnacle Hybrid Pro (2304:0226) requires mts_firmware flag to have any
sound. Without this flag it is useful only for watching silent movies.
Signed-off-by: Eugeniy Meshcheryakov <eugen at debian.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 00b27ce6205be8a943ae63d7bcce5208a9802bc3
Author: Jean-Francois Moine <moinejf at free.fr>
Date: Wed Jul 30 05:47:54 2008 -0300
V4L/DVB (8574): gspca: Bad bytesperlines of pixelformat in spca505/506/508 and vc023x.
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 01b988b2abdd60cc58c7916c5f91602d2571e0c5
Author: Jean-Francois Moine <moinejf at free.fr>
Date: Wed Jul 30 05:33:11 2008 -0300
V4L/DVB (8573): gspca: Bad scan of frame in spca505/506/508.
Bug introduced in changeset 6de914aaad86.
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 16fca0449997f1d77cd2d45d6c34b015f3853012
Author: Jean-Francois Moine <moinejf at free.fr>
Date: Wed Jul 30 05:14:38 2008 -0300
V4L/DVB (8572): gspca: Webcam 0c45:6143 in documentation.
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 335b3f88f2c3cb101059970f57860503b20d210f
Author: Jean-Francois Moine <moinejf at free.fr>
Date: Wed Jul 30 04:53:02 2008 -0300
V4L/DVB (8571): gspca: Don't use CONFIG_VIDEO_ADV_DEBUG as a compile option.
This option is changed to GSPCA_DEBUG and it is set by default in gspca.h.
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8f47a3cefbb275893ce26ade7094599e4b129bb3
Author: Jean-Francois Moine <moinejf at free.fr>
Date: Tue Jul 29 14:14:04 2008 -0300
V4L/DVB (8569): gspca: Set back the old values of Sonix sn9c120 and cleanup source.
The values from win traces do not seem to work while the webcams
did work with gspca v1.
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 0cd6759da646aae9d117df278ce3d5f3cab31904
Author: Jean-Francois Moine <moinejf at free.fr>
Date: Tue Jul 29 05:25:28 2008 -0300
V4L/DVB (8567): gspca: hflip and vflip controls added for ov519 - ov7670 plus init cleanup.
The hflip and vflip controls work for ov7670 only.
This bridge/sensor inverts blue and red - not fixed.
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit c2cfcf701881c9a4ef42d5a956f9f2d006c2af8e
Author: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Date: Tue Jul 29 05:30:58 2008 -0300
V4L/DVB (8564): fix vino driver build error
The vino driver needs #include <media/v4l2-ioctl.h>
drivers/media/video/vino.c: In function 'vino_ioctl':
drivers/media/video/vino.c:4364: error: implicit declaration of function 'video_usercopy'
make[3]: *** [drivers/media/video/vino.o] Error 1
Signed-off-by: Yoichi Yuasa <yoichi_yuasa at tripeaks.co.jp>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit dfb9aff025c4c874f9169e2fd690ce6fee2309fe
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Jul 28 16:58:19 2008 -0300
V4L/DVB (8563): fix drivers/media/video/arv.c compilation
This patch fixes the following compile errors:
<-- snip -->
...
CC [M] drivers/media/video/arv.o
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c: In function 'ar_ioctl':
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c:544: error: implicit declaration of function 'video_usercopy'
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c: At top level:
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c:758: error: unknown field 'type' specified in initializer
make[4]: *** [drivers/media/video/arv.o] Error 1
<-- snip -->
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 886f8d678a28882c193c2886c7280c0eccd8c9dd
Author: Adrian Bunk <bunk at kernel.org>
Date: Mon Jul 28 16:58:05 2008 -0300
V4L/DVB (8562): DVB_DRX397XD: remove FW_LOADER select
Also for the new DVB_DRX397XD driver the FW_LOADER select and the
corresponding dependency on HOTPLUG can be removed.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 35774f42dc6e765fc1d8a92f36e218f617a17e1a
Author: Mauro Carvalho Chehab <mchehab at infradead.org>
Date: Mon Jul 28 18:07:35 2008 -0300
V4L/DVB (8558): media/video/Kconfig: fix a typo
Thanks to Hermann Gausterer for pointing this issue.
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit b01466e14ce82ff96b74db19ebdaefb34a430a24
Author: Jean-Francois Moine <moinejf at free.fr>
Date: Mon Jul 28 07:52:27 2008 -0300
V4L/DVB (8552): gspca: Bad pixel format in the spca508 subdriver.
The pixel format should have been changed in changeset 6de914aaad86.
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 738608ae08572bf915c3fcd40e9579fbca06464b
Author: Jean-Francois Moine <moinejf at free.fr>
Date: Mon Jul 28 06:41:51 2008 -0300
V4L/DVB (8550): gspca: Change a bit the init of ov7660 and Sonix JPEG bridges.
Set back some values of gspcav1 in init of sonixj sensor ov7660.
Add some comments.
Signed-off-by: Jean-Francois Moine <moinejf at free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit edc9189c879af8cc8f1bf9746e63c5b014801a8a
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Mon Jul 28 15:39:38 2008 -0300
V4L/DVB (8549a): fix kernel-doc warning, function name, and docbook filename
Change function name in kernel-doc and add kernel-doc for parameter @index:
Warning(linhead//drivers/media/video/videodev.c:2090): No description found for parameter 'index'
Also change source file name in DocBook/videobook.tmpl to match the new
source file name.
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab at infradead.org>
commit 8c6a5cad1eec38c2bf3af94eb2d4350be29fa208
Author: Alexander Beregalov <a.beregalov at gmail.com>
Date: Wed Aug 6 02:43:24 2008 -0700
sparc: i8042-sparcio.h: fix warning
drivers/input/serio/i8042-sparcio.h:95: warning: 'sparc_i8042_driver'
defined but not used
Signed-off-by: Alexander Beregalov <a.beregalov at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit abf5cdb89d09ca981db10e1a85fd8531440165f2
Author: Joakim Koskela <jookos at gmail.com>
Date: Wed Aug 6 02:40:25 2008 -0700
ipsec: Interfamily IPSec BEET, ipv4-inner ipv6-outer
Here's a revised version, based on Herbert's comments, of a fix for
the ipv4-inner, ipv6-outer interfamily ipsec beet mode. It fixes the
network header adjustment during interfamily, as well as makes sure
that we reserve enough room for the new ipv6 header if we might have
something else as the inner family. Also, the ipv4 pseudo header
construction was added.
Signed-off-by: Joakim Koskela <jookos at gmail.com>
Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit eb49e63093498cd17382018495b8cfb5b4a679bd
Author: Joakim Koskela <jookos at gmail.com>
Date: Wed Aug 6 02:39:30 2008 -0700
ipsec: Interfamily IPSec BEET
Here's a revised version, based on Herbert's comments, of a fix for
the ipv6-inner, ipv4-outer interfamily ipsec beet mode. It fixes the
network header adjustment in interfamily, and doesn't reserve space
for the pseudo header anymore when we have ipv6 as the inner family.
Signed-off-by: Joakim Koskela <jookos at gmail.com>
Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 9714be7da8b32f36d2468fe08ff603b6402df8cf
Author: Krzysztof Piotr Oledzki <ole at ans.pl>
Date: Wed Aug 6 02:35:44 2008 -0700
netfilter: fix two recent sysctl problems
Starting with 9043476f726802f4b00c96d0c4f418dde48d1304 ("[PATCH]
sanitize proc_sysctl") we have two netfilter releated problems:
- WARNING: at kernel/sysctl.c:1966 unregister_sysctl_table+0xcc/0x103(),
caused by wrong order of ini/fini calls
- net.netfilter is duplicated and has truncated set of records
Thanks to very useful guidelines from Al Viro, this patch fixes both
of them.
Signed-off-by: Krzysztof Piotr Oledzki <ole at ans.pl>
Acked-by: Al Viro <viro at zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1ca615fb816ba85dc765209a9b58ab82cc99bce0
Author: Rami Rosen <ramirose at gmail.com>
Date: Wed Aug 6 02:34:21 2008 -0700
ipv6: replace dst_metric() with dst_mtu() in net/ipv6/route.c.
This patch replaces dst_metric() with dst_mtu() in net/ipv6/route.c.
Signed-off-by: Rami Rosen <ramirose at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 6d273f8d011c351c9603c1dbfeae2c7458edd30d
Author: Rami Rosen <ramirose at gmail.com>
Date: Wed Aug 6 02:33:49 2008 -0700
ipv4: replace dst_metric() with dst_mtu() in net/ipv4/route.c.
This patch replaces dst_metric() with dst_mtu() in net/ipv4/route.c.
Signed-off-by: Rami Rosen <ramirose at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 26b994fad6a062697846a861ecc008447409dfb6
Author: Steve French <sfrench at us.ibm.com>
Date: Wed Aug 6 05:11:33 2008 +0000
[CIFS] Code cleanup in old sessionsetup code
Remove some long lines
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 0967d61ea0d8e8a7826bd8949cd93dd1e829ac55
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Aug 5 21:49:54 2008 -0700
Linux 2.6.27-rc2
commit 18351070b86d155713cf790b26af4f21b1fd0b29
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Aug 5 21:42:21 2008 -0700
Re-introduce "[SCSI] extend the last_sector_bug flag to cover more sectors"
This re-introduces commit 2b142900784c6e38c8d39fa57d5f95ef08e735d8,
which was reverted due to the regression it caused by commit
fca082c9f1e11ec07efa8d2f9f13688521253f36.
That regression was not root-caused by the original commit, it was just
uncovered by it, and the real fix was done by Alan Stern in commit
580da34847488b404218d1d7f53b156f245f5555 ("Fix USB storage hang on
command abort").
We can thus re-introduce the change that was confirmed by Alan Jenkins
to be still required by his odd card reader.
Cc: Alan Jenkins <alan-jenkins at tuffmail.co.uk>
Cc: Alan Stern <stern at rowland.harvard.edu>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 95089910933e10768cfef1ab0bab0c55b962aacb
Author: Jeff Layton <jlayton at redhat.com>
Date: Wed Aug 6 04:39:02 2008 +0000
[CIFS] cifs_mkdir and cifs_create should respect the setgid bit on parent dir
If a server supports unix extensions but does not support POSIX create
routines, then the client will create a new inode with a standard SMB
mkdir or create/open call and then will set the mode. When it does this,
it does not take the setgid bit on the parent directory into account.
This patch has CIFS flip on the setgid bit when the parent directory has
it. If the share is mounted with "setuids" then also change the group
owner to the gid of the parent.
This patch should apply cleanly on top of the setattr cleanup patches
that I sent a few weeks ago.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 2dd2dfa060650118661422d4e666ac804c388751
Author: Jeff Layton <jlayton at redhat.com>
Date: Sat Aug 2 07:26:12 2008 -0400
Rename CIFSSMBSetFileTimes to CIFSSMBSetFileInfo and add PID arg
The new name is more clear since this is also used to set file
attributes. We'll need the pid_of_opener arg so that we can
pass in filehandles of other pids and spare ourselves an open
call.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 6fc000e5190234c7e5b244d1e2095d50b630d63f
Author: Jeff Layton <jlayton at redhat.com>
Date: Sat Aug 2 07:26:12 2008 -0400
change CIFSSMBSetTimes to CIFSSMBSetPathInfo
CIFSSMBSetTimes is a deceptive name. This function does more that just
set file times. Change it to CIFSSMBSetPathInfo, which is closer to its
real purpose.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 063ea27925d70b1d9dd4343d685f722f0274bfd1
Author: Steve French <sfrench at us.ibm.com>
Date: Wed Aug 6 04:23:13 2008 +0000
[CIFS] fix trailing whitespace
Jeff left trailing whitespace in previous patch
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 4e1e7fb9e879d48011a887715d7966484d9644ea
Author: Jeff Layton <jlayton at redhat.com>
Date: Sat Aug 2 07:26:12 2008 -0400
bundle up Unix SET_PATH_INFO args into a struct and change name
We'd like to be able to use the unix SET_PATH_INFO_BASIC args to set
file times as well, but that makes the argument list rather long. Bundle
up the args for unix SET_PATH_INFO call into a struct. For now, we don't
actually use the times fields anywhere. That will be done in a follow-on
patch.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit e63e03273b89f7248baa56cf242474f661e776e1
Merge: 37193fb4639fa94f91cbbab1e8aca596300e1d94 ffb208479bd62ab26c29a242faeb1de1c6d5fcdc
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Aug 5 19:37:42 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (78 commits)
AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE
pktgen: mac count
pktgen: random flow
bridge: Eliminate unnecessary forward delay
bridge: fix compile warning in net/bridge/br_netfilter.c
ipv4: remove unused field in struct flowi (include/net/flow.h).
tg3: Fix 'scheduling while atomic' errors
net: Kill plain NET_XMIT_BYPASS.
net_sched: Add qdisc __NET_XMIT_BYPASS flag
net_sched: Add qdisc __NET_XMIT_STOLEN flag
iwl3945: fix merge mistake for packet injection
iwlwifi: grap nic access before accessing periphery registers
iwlwifi: decrement rx skb counter in scan abort handler
iwlwifi: fix unhandled interrupt when HW rfkill is on
iwlwifi: implement iwl5000_calc_rssi
iwlwifi: memory allocation optimization
iwlwifi: HW bug fixes
p54: Fix potential concurrent access to private data
rt2x00: Disable link tuning in rt2500usb
iwlwifi: Don't use buffer allocated on the stack for led names
...
commit ffb208479bd62ab26c29a242faeb1de1c6d5fcdc
Author: Ralf Baechle <ralf at linux-mips.org>
Date: Tue Aug 5 18:46:57 2008 -0700
AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE
Since 49ffcf8f99e8d33ec8afb450956804af518fd788 ("sysctl: update
sysctl_check_table") setting struct ctl_table.procname = NULL does no
longer work as it used to the way the AX.25 code is expecting it to
resulting in the AX.25 sysctl registration code to break if
CONFIG_AX25_DAMA_SLAVE was not set as in some distribution kernels.
Kernel releases from 2.6.24 are affected.
Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ff2a79a5a934fe0dbb136ffad61f79b5c6385614
Author: Robert Olsson <robert.olsson at its.uu.se>
Date: Tue Aug 5 18:45:05 2008 -0700
pktgen: mac count
dst_mac_count and src_mac_count patch from Eneas Hunguana
We have sent one mac address to much.
Signed-off-by: Robert Olsson <robert.olsson at its.uu.se>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1211a64554065316e02b3c62b320088ad4f63260
Author: Robert Olsson <robert.olsson at its.uu.se>
Date: Tue Aug 5 18:44:26 2008 -0700
pktgen: random flow
Random flow generation has not worked. This fixes it.
Signed-off-by: Robert Olsson <robert.olsson at its.uu.se>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ef647f1300d69adb8223d970554d59d7e244db6d
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Tue Aug 5 18:42:51 2008 -0700
bridge: Eliminate unnecessary forward delay
From: Stephen Hemminger <shemminger at vyatta.com>
Based upon original patch by Herbert Xu, which contained
the following problem description:
--------------------
When the forward delay is set to zero, we still delay the setting
of the forwarding state by one or possibly two timers depending
on whether STP is enabled. This could either turn out to be
instantaneous, or horribly slow depending on the load of the
machine.
As there is nothing preventing us from enabling forwarding straight
away, this patch eliminates this potential delay by executing the
code directly if the forward delay is zero.
The effect of this problem is that immediately after the carrier
comes on a port, the bridge will drop all packets received from
that port until it enters forwarding mode, thus causing unnecessary
packet loss.
Note that this patch doesn't fully remove the delay due to the
link watcher. We should also check the carrier state when we
are about to drop an incoming packet because the port is disabled.
But that's for another patch.
--------------------
This version of the fix takes a different approach, in that
it just does the state change directly.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 37193fb4639fa94f91cbbab1e8aca596300e1d94
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Tue Aug 5 14:59:29 2008 -0700
docbook: fix s390 fatal error after header files moved
Fix (fatal error) s390 docbook file to handle renamed header files.
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
cc: Martin Schwidefsky <schwidefsky at de.ibm.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8c275ce327447f4cf3d0904d1a5a6ffa1b92de7f
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Tue Aug 5 13:01:42 2008 -0700
drivers/media/video/vino.c needs v4l2-ioctl.h
mips allmodconfig:
drivers/media/video/vino.c: In function `vino_free_buffer_with_count':
drivers/media/video/vino.c:811: warning: passing arg 1 of `virt_to_phys' makes pointer from integer without a cast
drivers/media/video/vino.c: In function `vino_allocate_buffer':
drivers/media/video/vino.c:889: warning: passing arg 1 of `virt_to_phys' makes pointer from integer without a cast
drivers/media/video/vino.c: In function `vino_ioctl':
drivers/media/video/vino.c:4364: error: implicit declaration of function `video_usercopy'
The patch fixes the error, but not the warnings.
Cc: Mauro Carvalho Chehab <mchehab at infradead.org>
Cc: Hans Verkuil <hverkuil at xs4all.nl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dfe195fb79e88c334481f1362fef52f6d2e30b2d
Author: Benny Halevy <bhalevy at panasas.com>
Date: Tue Aug 5 13:01:41 2008 -0700
mm: fix uninitialized variables for find_vma_prepare callers
gcc 4.3.0 correctly emits the following warnings.
When a vma covering addr is found, find_vma_prepare indeed returns without
setting pprev, rb_link, and rb_parent.
mm/mmap.c: In function `insert_vm_struct':
mm/mmap.c:2085: warning: `rb_parent' may be used uninitialized in this function
mm/mmap.c:2085: warning: `rb_link' may be used uninitialized in this function
mm/mmap.c:2084: warning: `prev' may be used uninitialized in this function
mm/mmap.c: In function `copy_vma':
mm/mmap.c:2124: warning: `rb_parent' may be used uninitialized in this function
mm/mmap.c:2124: warning: `rb_link' may be used uninitialized in this function
mm/mmap.c:2123: warning: `prev' may be used uninitialized in this function
mm/mmap.c: In function `do_brk':
mm/mmap.c:1951: warning: `rb_parent' may be used uninitialized in this function
mm/mmap.c:1951: warning: `rb_link' may be used uninitialized in this function
mm/mmap.c:1949: warning: `prev' may be used uninitialized in this function
mm/mmap.c: In function `mmap_region':
mm/mmap.c:1092: warning: `rb_parent' may be used uninitialized in this function
mm/mmap.c:1092: warning: `rb_link' may be used uninitialized in this function
mm/mmap.c:1089: warning: `prev' may be used uninitialized in this function
Hugh adds: in fact, none of find_vma_prepare's callers use those values
when a vma is found to be already covering addr, it's either an error or
an occasion to munmap and repeat. Okay, let's quieten the compiler (but I
would prefer it if pprev, rb_link and rb_parent were meaningful in that
case, rather than whatever's in them from descending the tree).
Signed-off-by: Benny Halevy <bhalevy at panasas.com>
Signed-off-by: Hugh Dickins <hugh at veritas.com>
Cc: "Ryan Hope" <rmh3093 at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit bf1db69fbf4ff511e88736ce2e6318846f34492b
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Aug 5 13:01:35 2008 -0700
pm_qos: spelling fixes
A documentation cleanup patch. With a minor tweak to clarify units for
kbs.
[akpm at linux-foundation.org: coding-style fixes]
Signed-off-by: mark gross <mgross at linux.intel.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 7c44319dc6deb0028ef7811670bf1e4bc6644672
Author: Alexander Beregalov <a.beregalov at gmail.com>
Date: Tue Aug 5 13:01:34 2008 -0700
proc: fix warnings
proc: fix warnings
fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'u64'
fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 4 has type 'u64'
fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 5 has type 'u64'
fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 6 has type 'u64'
fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 7 has type 'u64'
fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 8 has type 'u64'
fs/proc/base.c:2429: warning: format '%llu' expects type 'long long unsigned int', but argument 9 has type 'u64'
Signed-off-by: Alexander Beregalov <a.beregalov at gmail.com>
Acked-by: Andrea Righi <righi.andrea at gmail.com>
Cc: Oleg Nesterov <oleg at tv-sign.ru>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dc39778f952a820b7da45756a900a4778da343cd
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date: Tue Aug 5 13:01:33 2008 -0700
drivers/misc/sgi-gru/grutlbpurge.c: removed duplicated #include
Removed duplicated include <linux/delay.h> in
drivers/misc/sgi-gru/grutlbpurge.c.
Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
Cc: Jack Steiner <steiner at sgi.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dc60bf1d8328076c27fe07c1849a5c8399bafc39
Author: Alexander Beregalov <a.beregalov at gmail.com>
Date: Tue Aug 5 13:01:33 2008 -0700
omfs: fix warning
fs/omfs/inode.c:495: warning: format '%llx' expects type 'long long
unsigned int', but argument 2 has type 'u64'
fs/omfs/inode.c:495: warning: format '%llx' expects type 'long
long unsigned int', but argument 3 has type '__be64'
Signed-off-by: Alexander Beregalov <a.beregalov at gmail.com>
Acked-by: Bob Copeland <me at bobcopeland.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 32ab8f97dd95592b17e684f7722caa0556087b99
Author: Randy Dunlap <randy.dunlap at oracle.com>
Date: Tue Aug 5 13:01:32 2008 -0700
kernel-doc: skip nested struct/union cleanly
Fix handling of nested structs or unions. The regex to strip (eliminate)
nested structs or unions was limited to only 0 or 1 matches. This can
cause an uneven number of left/right braces to be stripped, which causes
this:
Warning(linux-2.6.27-rc1-git2//include/net/mac80211.h:336): No description found for parameter '}'
Signed-off-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d2dc1f4adb4b5b02d87e49e115e5107f4da790c0
Author: Jan Beulich <jbeulich at novell.com>
Date: Tue Aug 5 13:01:31 2008 -0700
dma: fix order calculation in dma_mark_declared_memory_occupied()
get_order() takes byte-sized input, not a page-granular one.
Irrespective of this fix I'm inclined to believe that this doesn't work
right anyway - bitmap_allocate_region() has an implicit assumption of
'pos' being suitable for 'order', which this function doesn't seem to
enforce (and since it's being called with a byte-granular value there's no
reason to believe that the callers would make sure device_addr is passed
accordingly - it's also not documented that way).
Signed-off-by: Jan Beulich <jbeulich at novell.com>
Cc: James E.J. Bottomley <James.Bottomley at HansenPartnership.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Dmitry Baryshkov <dbaryshkov at gmail.com>
Cc: Jesse Barnes <jbarnes at virtuousgeek.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 978cc90c469b38bcbbfd00a8c183d74e5b17bf45
Author: Alexander Beregalov <a.beregalov at gmail.com>
Date: Tue Aug 5 13:01:29 2008 -0700
atyfb_base.c: fix warning
drivers/video/aty/atyfb_base.c:2663: warning: 'aty_resume_chip' defined
but not used
Signed-off-by: Alexander Beregalov <a.beregalov at gmail.com>
Cc: Ville Syrjala <syrjala at sci.fi>
Cc: Antonino A. Daplas <adaplas at pol.net>
Cc: Mark Asselstine <asselsm at gmail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5394ba0fd892291eb425649fdbc82b673e0b7956
Author: Julia Lawall <julia at diku.dk>
Date: Tue Aug 5 13:01:28 2008 -0700
drivers/video/fsl-diu-fb.c: add missing of_node_put
of_node_put is needed before discarding a value received from
of_find_node_by_type, eg in error handling code.
The semantic patch that makes the change is as follows:
(http://www.emn.fr/x-info/coccinelle/)
// <smpl>
@@
struct device_node *n;
struct device_node *n1;
struct device_node *n2;
statement S;
identifier f1,f2;
expression E1,E2;
constant C;
@@
n = of_find_node_by_type(...)
...
if (!n) S
... when != of_node_put(n)
when != n1 = f1(n,...)
when != E1 = n
when any
when strict
(
+ of_node_put(n);
return -C;
|
of_node_put(n);
|
n2 = f2(n,...)
|
E2 = n
|
return ...;
)
// </smpl>
Signed-off-by: Julia Lawall <julia at diku.dk>
Acked-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Cc: Timur Tabi <timur at freescale.com>
Cc: York Sun <yorksun at freescale.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9bd6ceb666e76b9a3caefa158827a571ead55b6a
Author: Jean Delvare <khali at linux-fr.org>
Date: Tue Aug 5 13:01:27 2008 -0700
radeonfb: give i2c buses nicer names
The name of the i2c buses shows in the output of "i2cdetect -l", so
it's important to give informative names.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c213ddf330e29f9d141705444dc45683adbb99b0
Author: Krzysztof Helt <krzysztof.h1 at wp.pl>
Date: Tue Aug 5 13:01:26 2008 -0700
fbcon: fix scrolling after logo is cleared
If the 'clear' command is used on the frame buffer with a logo the upper
area is filled by few lines but not scrolled anymore.
Fix this by removing the protected area for the logo if any part of the
logo is cleared.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit efc491814308f89d5ef6c4fe19ae4552a67d4132
Author: David Miller <davem at davemloft.net>
Date: Tue Aug 5 13:01:25 2008 -0700
radeon: misc corrections
I have a new PCI-E radeon RV380 series card (PCI device ID 5b64) that
hangs in my sparc64 boxes when the init scripts set the font. The problem
goes away if I disable acceleration.
I haven't figured out that bug yet, but along the way I found some
corrections to make based upon some auditing.
1) The RB2D_DC_FLUSH_ALL value used by the kernel fb driver
and the XORG video driver differ. I've made the kernel
match what XORG is using.
2) In radeonfb_engine_reset() we have top-level code structure
that roughly looks like:
if (family is 300, 350, or V350)
do this;
else
do that;
...
if (family is NOT 300, OR
family is NOT 350, OR
family is NOT V350)
do another thing;
this last conditional makes no sense, is always true,
and obviously was likely meant to be "family is NOT
300, 350, or V350". So I've made the code match the
intent.
Signed-off-by: David S. Miller <davem at davemloft.net>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Tested-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit f6ac436dcc4c34709bcde355f3f2254ac0a183d4
Author: Mark Asselstine <mark.asselstine at windriver.com>
Date: Tue Aug 5 13:01:24 2008 -0700
Remove the deprecated cli() sti() functions
These functions have been deprecated for some time now but remained until
all legacy callers could be removed. With a few commits in 2.6.26 this
has happened so now we can remove these deprecated functions.
Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
Reviewed-by: Matthew Wilcox <willy at linux.intel.com>
Cc: Alan Cox <alan at lxorguk.ukuu.org.uk>
Cc: Ingo Molnar <mingo at elte.hu>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 8cd6819842b79953c61250c719f61e01e51dd8cd
Author: Ben Dooks <ben-linux at fluff.org>
Date: Tue Aug 5 13:01:24 2008 -0700
backlight: add MODULE_ALIAS() to pwm_backlight driver
Add the missing MODULE_ALIAS() to the pwm_backlight driver.
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Cc: Richard Purdie <rpurdie at rpsys.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 14563a4ec450f35c70fbe5f6ac5199e9d5a0edc5
Author: Ben Dooks <ben-linux at fluff.org>
Date: Tue Aug 5 13:01:22 2008 -0700
backlight: add more information output to pwm_backlight
Make the error paths in the pwm_backlight driver more informative in the
probe path, especially for the times that it finds an error.
Cc: Russell King <rmk at arm.linux.org.uk>
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Cc: Richard Purdie <rpurdie at rpsys.net>
Acked-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 26cb8bb21b11245a53f79d9fa766537752f77d88
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Tue Aug 5 13:01:21 2008 -0700
blackfin RTC driver: drop PIE/stopwatch code since the hardware can only do a max of 1HZ and this same functionality is provided by UIE
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Cc: David Brownell <david-b at pacbell.net>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e12af37d9ee09c2ac6da26a51c77754dec09fed4
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Tue Aug 5 13:01:21 2008 -0700
blackfin RTC driver: convert PIE handling to irq_set_state() as pointed out by David Brownell
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Cc: David Brownell <david-b at pacbell.net>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 140fab14aef093cedf87f69234474c04fdcec99c
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Tue Aug 5 13:01:20 2008 -0700
blackfin RTC driver: wait for the write complete interrupt complete before sleeping
Since we use the write complete interrupt, wait for it
to complete before sleeping so we don't wake right back up due to it
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Cc: David Brownell <david-b at pacbell.net>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 3b128fe04a3087d6e974b87402dc6e75d3142186
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Tue Aug 5 13:01:19 2008 -0700
blackfin RTC driver: disable the write complete irq upon close
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Cc: David Brownell <david-b at pacbell.net>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 605eb8b3c05e970caf71c48f693efe33c212fb7b
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Tue Aug 5 13:01:18 2008 -0700
blackfin RTC driver: don't bother passing the rtc struct down to bfin_rtc_int_{set,clear} since it isnt needed (shaves off ~100bytes)
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <bryan.wu at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Cc: David Brownell <david-b at pacbell.net>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 813006f4bb4a39afdde8ab2e3559971c029d1dc0
Author: Mike Frysinger <vapier.adi at gmail.com>
Date: Tue Aug 5 13:01:18 2008 -0700
blackfin RTC driver: add support for power management framework
Signed-off-by: Mike Frysinger <vapier.adi at gmail.com>
Signed-off-by: Bryan Wu <bryan.wu at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Cc: David Brownell <david-b at pacbell.net>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5aeb776d0c2bb1dd3ef01f4805929e2bc2923e7b
Author: Sonic Zhang <sonic.zhang at analog.com>
Date: Tue Aug 5 13:01:17 2008 -0700
blackfin RTC driver: Fix bug Only RTC interrupt can wake up deeper sleep core
Signed-off-by: Sonic Zhang <sonic.zhang at analog.com>
Signed-off-by: Bryan Wu <bryan.wu at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Cc: David Brownell <david-b at pacbell.net>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dd279f6127c0f64dfb0055bc0adb97a284a08df3
Author: Mike Frysinger <michael.frysinger at analog.com>
Date: Tue Aug 5 13:01:15 2008 -0700
blackfin RTC driver: if we dont define irq_set_freq, the common rtc-dev layer will give us the same behavior of returning ENOTTY
Signed-off-by: Mike Frysinger <michael.frysinger at analog.com>
Signed-off-by: Bryan Wu <bryan.wu at analog.com>
Signed-off-by: Bryan Wu <cooloney at kernel.org>
Cc: David Brownell <david-b at pacbell.net>
Cc: Alessandro Zummo <a.zummo at towertech.it>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c69ad71bcdecbaab82cfacb1dc967bd7fd967a3b
Author: David Brownell <dbrownell at users.sourceforge.net>
Date: Tue Aug 5 13:01:14 2008 -0700
genirq: better warning on irqchip->set_type() failure
While I'm glad to finally see the hole fixed whereby passing an invalid
IRQ trigger type to request_irq() would be ignored, the current diagnostic
isn't quite useful. Fixed by also listing the trigger type which was
rejected.
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Acked-by: Uwe Kleine-König <Uwe.Kleine-Koenig at digi.com>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Thomas Gleixner <tglx at linutronix.de>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5b2becc8cffdccdd60c63099f592ddd35aa6c34f
Author: Oleg Nesterov <oleg at tv-sign.ru>
Date: Tue Aug 5 13:01:13 2008 -0700
semaphore: __down_common: use signal_pending_state()
Change __down_common() to use signal_pending_state() instead of open
coding.
The changes in kernel/semaphore.o are just artifacts, the state checks are
optimized away.
Signed-off-by: Oleg Nesterov <oleg at tv-sign.ru>
Cc: Ingo Molnar <mingo at elte.hu>
Cc: Matthew Wilcox <matthew at wil.cx>
Cc: Roland McGrath <roland at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 32194450330be327f3b25bf6b66298bd122599e9
Author: Tom Zanussi <tzanussi at gmail.com>
Date: Tue Aug 5 13:01:10 2008 -0700
relay: fix "full buffer with exactly full last subbuffer" accounting problem
In relay's current read implementation, if the buffer is completely full
but hasn't triggered the buffer-full condition (i.e. the last write
didn't cross the subbuffer boundary) and the last subbuffer is exactly
full, the subbuffer accounting code erroneously finds nothing available.
This patch fixes the problem.
Signed-off-by: Tom Zanussi <tzanussi at gmail.com>
Cc: Eduard - Gabriel Munteanu <eduard.munteanu at linux360.ro>
Cc: Pekka Enberg <penberg at cs.helsinki.fi>
Cc: Jens Axboe <jens.axboe at oracle.com>
Cc: Mathieu Desnoyers <compudj at krystal.dyndns.org>
Cc: Andrea Righi <righi.andrea at gmail.com>
Cc: <stable at kernel.org> [2.6.25.x, 2.6.26.x]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 60cadec9da7b6c91aca51f408c828f7e74a68379
Author: Shadi Ammouri <shadi at marvell.com>
Date: Tue Aug 5 13:01:09 2008 -0700
spi: new orion_spi driver
This adds an SPI driver for the SPI controller found in various Marvell
Orion ARM SoCs. It currently supports only one slave, which must use SPI
mode 0.
[dbrownell at users.sourceforge.net: cleanups, meet specs, pass "sparse"]
Signed-off-by: Shadi Ammouri <shadi at marvell.com>
Signed-off-by: Saeed Bishara <saeed at marvell.com>
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 756fcab27756f32722b748e2aff3393eef9a589d
Author: Hannes Reinecke <hare at suse.de>
Date: Tue Aug 5 13:01:08 2008 -0700
block/cciss.c: remove pointless curr_queue calculation
curr_queue is a local variable in a for loop, and it's being initialized
at the start of each loop. So any assignment at the end of the loop is
pointless.
Signed-off-by: Hannes Reinecke <hare at suse.de>
Cc: Mike Miller <mike.miller at hp.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 594a8819774b09ee5bf72d23300489459ff1f882
Author: Ondrej Zajicek <santiago at crfreenet.org>
Date: Tue Aug 5 13:01:06 2008 -0700
vt8623fb: fix kernel oops
commit 20e061fb750d36ec0ffcb2e44ed7dafa9018223b
Author: Ondrej Zajicek <santiago at crfreenet.org>
Date: Mon Apr 28 02:15:18 2008 -0700
fbdev: framebuffer_alloc() fixes
Correct the dev arg of framebuffer_alloc() in arkfb, s3fb and vt8623fb.
causes a null-pointer deref because "info->dev is NULL, info was just
kzallocated".
Signed-off-by: Ondrej Zajicek <santiago at crfreenet.org>
Reported-by: "MadLoisae at gmx.net" <MadLoisae at gmx.net>
Tested-by: "MadLoisae at gmx.net" <MadLoisae at gmx.net>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Cc: "Antonino A. Daplas" <adaplas at pol.net>
Cc: Krzysztof Helt <krzysztof.h1 at poczta.fm>
Cc: <stable at kernel.org> [2.6.26.x]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c6e2bee26eee190b20cd87e71b288bca6a5357a4
Author: Bernhard Walle <bwalle at suse.de>
Date: Tue Aug 5 13:01:05 2008 -0700
kdump: report actual value of VMCOREINFO_OSRELEASE in VMCOREINFO
The current implementation reports the structure name as
VMCOREINFO_OSRELEASE in VMCOREINFO, e.g.
VMCOREINFO_OSRELEASE=init_uts_ns.name.release
That doesn't make sense because it's always the same. Instead, use the
value, e.g.
VMCOREINFO_OSRELEASE=2.6.26-rc3
That's also what the 'makedumpfile -g' does.
Signed-off-by: Bernhard Walle <bwalle at suse.de>
Cc: "Ken'ichi Ohmichi" <oomichi at mxs.nes.nec.co.jp>
Acked-by: Vivek Goyal <vgoyal at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 775587b6d769af3ba779a12ce790db4ccf0d1676
Author: Anton Vorontsov <avorontsov at ru.mvista.com>
Date: Tue Aug 5 13:01:02 2008 -0700
powerpc: 86xx: mpc8610_hpcd: add watchdog node
Signed-off-by: Anton Vorontsov <avorontsov at ru.mvista.com>
Cc: Kumar Gala <galak at kernel.crashing.org>
Cc: Wim Van Sebroeck <wim at iguana.be>
Cc: Paul Mackerras <paulus at samba.org>
Cc: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5c9ffc9c3d61dfcafd7cdb61c7b94f2d7ac408fb
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Tue Aug 5 13:01:01 2008 -0700
mm_init.c: avoid ifdef-inside-macro-expansion
gcc-3.2:
mm/mm_init.c:77:1: directives may not be used inside a macro argument
mm/mm_init.c:76:47: unterminated argument list invoking macro "mminit_dprintk"
mm/mm_init.c: In function `mminit_verify_pageflags_layout':
mm/mm_init.c:80: `mminit_dprintk' undeclared (first use in this function)
mm/mm_init.c:80: (Each undeclared identifier is reported only once
mm/mm_init.c:80: for each function it appears in.)
mm/mm_init.c:80: syntax error before numeric constant
Also fix a typo in a comment.
Reported-by: Adrian Bunk <bunk at kernel.org>
Cc: Mel Gorman <mel at csn.ul.ie>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 35ad1c8803921b28541ad28bfb18dc3b6295ba98
Merge: 580da34847488b404218d1d7f53b156f245f5555 f454cbe8cd38b6d447e74ddaf012017fea42717e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Tue Aug 5 11:39:33 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
ide: ->cable_detect method cannot be marked __devinit
ide: ->quirkproc method cannot be marked __devinit
cs5520: add enablebits checking
cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
ide-cd: fix endianity for the error message in cdrom_read_capacity
ide: remove CONFIG_IDE_MAX_HWIFS
remove unneeded #include <linux/ide.h>'s
ide: fix regression caused by ide_device_{get,put}() addition (take 2)
remove unnecessary <linux/hdreg.h> includes
ide: sanitize struct ide_port_ops documentation (take 2)
ide: fix ide_fix_driveid()
ide: fix pre-EIDE SWDMA support on big-endian
commit e34a8ae79056e6cea4a1ac21119ee3c91f378f99
Author: Dan Williams <dan.j.williams at intel.com>
Date: Tue Aug 5 10:22:05 2008 -0700
async_tx: fix missing braces in async_xor_zero_sum
Found-by: Yuri Tikhonov <yur at emcraft.com>
Signed-off-by: Dan Williams <dan.j.williams at intel.com>
commit 580da34847488b404218d1d7f53b156f245f5555
Author: Alan Stern <stern at rowland.harvard.edu>
Date: Tue Aug 5 13:05:17 2008 -0400
Fix USB storage hang on command abort
Okay, I found the cause of the hang. It is a simple bug in the USB
scatter-gather library, caused by changes added in response to the S-G
chaining modification.
This patch (as1125) fixes a bug in the USB scatter-gather library.
Early exit from the S-G initialization loop does not reset the count of
outstanding URBs.
Signed-off-by: Alan Stern <stern at rowland.harvard.edu>
Cc: Matthew Dharm <mdharm-usb at one-eyed-alien.net>
Cc: David Brownell <david-b at pacbell.net>
Cc: Alan Jenkins <alan-jenkins at tuffmail.co.uk>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Cc: Greg KH <greg at kroah.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9e96af8525264973d8d1f800b0ddce0289fc0bdd
Author: Suresh Jayaraman <sjayaraman at suse.de>
Date: Tue Aug 5 14:38:40 2008 +0530
Fix missing braces in cifs_revalidate()
Fix missing braces introduced during commit
cea218054ad277d6c126890213afde07b4eb1602. Though setting wbrc to 0
keeps this from causing real bug, this should have been there.
Acked-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Suresh Jayaraman <sjayaraman at suse.de>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit f454cbe8cd38b6d447e74ddaf012017fea42717e
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Aug 5 18:17:04 2008 +0200
ide: ->cable_detect method cannot be marked __devinit
Now that we have warm-plug support ->cable_detect method no longer
can be be marked __devinit.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 36de994809264f752e51b74e77a9c49091d14230
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Aug 5 18:17:03 2008 +0200
ide: ->quirkproc method cannot be marked __devinit
Now that we have warm-plug support ->quirkproc method no longer
can be be marked __devinit.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 24307ffabd5b39bad443641f54b12ee2ba7a38ac
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Aug 5 18:17:03 2008 +0200
cs5520: add enablebits checking
Based on sparse comments in OpenFirmware code
(no Cx5510/Cx5520 datasheet here).
This fixes 2.6.26 regression reported by TAKADA
and caused by addition of warm-plug support.
Tested-by: TAKADA Yoshihito <takada at mbf.nifty.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit af744e3294d09d706c4eae26cffaaa68a8d40337
Author: Tejun Heo <tj at kernel.org>
Date: Tue Aug 5 18:17:02 2008 +0200
cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
According to MMC-3 (or any later versions) READ TOCs are mandatory
commands and have nothing to do with CDC_PLAY_AUDIO. I have no idea why
the check was put there in the first place but it now only breaks
automatic actions on certain drives.
Note that this test was only effective when ide-cdrom was being used
as sr didn't mask CDC_PLAY_AUDIO according to the capabilities.
Signed-off-by: Tejun Heo <tj at kernel.org>
Acked-by: Jens Axboe <jens.axboe at oracle.com>
Cc: Borislav Petkov <petkovbb at googlemail.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 938bb03d188a1e688fb0bcae49788f540193e80a
Author: Petr Tesarik <ptesarik at suse.cz>
Date: Tue Aug 5 18:17:02 2008 +0200
ide-cd: fix endianity for the error message in cdrom_read_capacity
Aesthetic regards aside, commit e8e7b9eb11c34ee18bde8b7011af41938d1ad667
still leaves a bug in the error message, because it uses the unconverted
big-endian value for printk.
Fix this by using a local variable in machine byte order. The result is
correct, more readable, and also produces slightly shorter code on i386.
Signed-off-by: Petr Tesarik <ptesarik at suse.cz>
Cc: Jens Axboe <jens.axboe at oracle.com>
Cc: Jan Kara <jack at suse.cz>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: <stable at kernel.org>
Acked-by: Borislav Petkov <petkovbb at gmail.com>
[bart: __u32 -> u32]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit c5bfc3757f1d843a8e1261840c1f53c5062f8e92
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Aug 5 18:17:01 2008 +0200
ide: remove CONFIG_IDE_MAX_HWIFS
The benefits of a user settable CONFIG_IDE_MAX_HWIFS have become pretty
tiny and are no longer considered worth the trouble of an own option.
Simply always #define MAX_HWIFS to 10.
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 0e25f710618ce919ac5ae4850c90d3fca19565c3
Author: Adrian Bunk <bunk at kernel.org>
Date: Tue Aug 5 18:17:00 2008 +0200
remove unneeded #include <linux/ide.h>'s
This patch remove unneeded #include <linux/ide.h>'s.
It also adds a required #include <linux/interrupt.h> that was previously
implicitely pulled by ide.h
Signed-off-by: Adrian Bunk <bunk at kernel.org>
[bart: revert change to tests/lkdtm.c (spotted by Stephen Rothwell)]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit d3e33ff59facec005e48ba3360502b73a04e4b4e
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Aug 5 18:16:59 2008 +0200
ide: fix regression caused by ide_device_{get,put}() addition (take 2)
On Monday 28 July 2008, Benjamin Herrenschmidt wrote:
[...]
> Vector: 300 (Data Access) at [c58b7b80]
> pc: c014f264: elv_may_queue+0x10/0x44
> lr: c0152750: get_request+0x2c/0x2c0
> sp: c58b7c30
> msr: 1032
> dar: c
> dsisr: 40000000
> current = 0xc58aaae0
> pid = 854, comm = media-bay
> enter ? for help
> mon> t
> [c58b7c40] c0152750 get_request+0x2c/0x2c0
> [c58b7c70] c0152a08 get_request_wait+0x24/0xec
> [c58b7cc0] c0225674 ide_cd_queue_pc+0x58/0x1a0
> [c58b7d40] c022672c ide_cdrom_packet+0x9c/0xdc
> [c58b7d70] c0261810 cdrom_get_disc_info+0x60/0xd0
> [c58b7dc0] c026208c cdrom_mrw_exit+0x1c/0x11c
> [c58b7e30] c0260f7c unregister_cdrom+0x84/0xe8
> [c58b7e50] c022395c ide_cd_release+0x80/0x84
> [c58b7e70] c0163650 kref_put+0x54/0x6c
> [c58b7e80] c0223884 ide_cd_put+0x40/0x5c
> [c58b7ea0] c0211100 generic_ide_remove+0x28/0x3c
> [c58b7eb0] c01e9d34 __device_release_driver+0x78/0xb4
> [c58b7ec0] c01e9e44 device_release_driver+0x28/0x44
> [c58b7ee0] c01e8f7c bus_remove_device+0xac/0xd8
> [c58b7f00] c01e7424 device_del+0x104/0x198
> [c58b7f20] c01e74d0 device_unregister+0x18/0x30
> [c58b7f40] c02121c4 __ide_port_unregister_devices+0x6c/0x88
> [c58b7f60] c0212398 ide_port_unregister_devices+0x38/0x80
> [c58b7f80] c0208ca4 media_bay_step+0x1cc/0x5c0
> [c58b7fb0] c0209124 media_bay_task+0x8c/0xcc
> [c58b7fd0] c00485c0 kthread+0x48/0x84
> [c58b7ff0] c0011b20 kernel_thread+0x44/0x60
The guilty commit turned out to be 08da591e14cf87247ec09b17c350235157a92fc3
("ide: add ide_device_{get,put}() helpers"). ide_device_put() is called
before kref_put() in ide_cd_put() so IDE device is already gone by the time
ide_cd_release() is reached.
Fix it by calling ide_device_get() before kref_get() and ide_device_put()
after kref_put() in all affected device drivers.
v2:
Brown paper bag time. In v1 cd->drive was referenced after dropping last
reference on cd object (which could result in OOPS in ide_device_put() as
reported/debugged by Mariusz Kozlowski). Fix it by caching cd->drive in
the local variable (fix other device drivers too).
Reported-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Reported-by: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
Cc: FUJITA Tomonori <fujita.tomonori at lab.ntt.co.jp>
Cc: Borislav Petkov <petkovbb at gmail.com>
Tested-by: Mariusz Kozlowski <m.kozlowski at tuxland.pl>
Tested-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit b5b9309d3415480b3e66314a1d6c89db58bff9de
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Aug 5 18:16:58 2008 +0200
remove unnecessary <linux/hdreg.h> includes
Following files don't need <linux/hdreg.h> at all:
- arch/mips/jazz/setup.c
- arch/sh/boards/mach-systemh/irq.c
- drivers/macintosh/mediabay.c
- drivers/scsi/hptiop.c
- drivers/usb/storage/freecom.c
- arch/powerpc/include/asm/ide.h
- init/main.c
Cc: Christoph Hellwig <hch at infradead.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 39b986a6c73434d122967dc86efb295ab9a28437
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Aug 5 18:16:57 2008 +0200
ide: sanitize struct ide_port_ops documentation (take 2)
v2:
Add missing '@'-s. (Noticed by Randy Dunlap)
Cc: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 242f44261e6c5fdc13e3cd12f949ab717dc37d58
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Aug 5 18:16:56 2008 +0200
ide: fix ide_fix_driveid()
Fix byte-swapping for id->words161_175[], id->words206_254[]
and id->words206_254[].
Luckily all words previously left in little-endian byte-order
are marked as reserved so this fix shouldn't affect user-space
applications.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 367fdcb4e401161e51aaee5d06b3f82098bafefc
Author: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
Date: Tue Aug 5 18:16:55 2008 +0200
ide: fix pre-EIDE SWDMA support on big-endian
id->tDMA is of 'unsigned char' type so endianness is already
correct and calling le16_to_cpu() is wrong.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier at gmail.com>
commit 3663b736a5083b3bce74520b637f630f01f66a7f
Author: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Date: Tue Aug 5 13:57:38 2008 +0200
avr32: Use <mach/foo.h> instead of <asm/arch/foo.h>
Update all avr32-specific files to use the new platform-specific header
locations. Drivers shared with ARM are left alone for now.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit 964d219b6a8a79ea4c8d77b6dcdcbbcda403c392
Author: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Date: Tue Aug 5 13:49:09 2008 +0200
avr32: Introduce arch/avr32/mach-*/include/mach
Add arch/avr32/mach-*/include to include search path and copy all the
files from include/asm/arch there. The old files will be removed once
ARM does the same change and all common drivers are converted.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit 84db8d7cdb072866f5a6c6ac2c9a74c5c48dd22f
Author: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Date: Tue Aug 5 13:35:07 2008 +0200
avr32: Move include/asm-avr32 to arch/avr32/include/asm
Leaving include/asm/arch alone for now.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
commit 33e334950abda8e42c3b6e6f280fad0d4ab92141
Merge: ad619800e4e034cad44299b2a22df9eebb043ac3 3e2236c108792c3afbbfbe3f373ee7fdd68eda8e
Author: David S. Miller <davem at davemloft.net>
Date: Tue Aug 5 01:28:35 2008 -0700
Merge branch 'no-ath9k' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
commit ad619800e4e034cad44299b2a22df9eebb043ac3
Author: Rami Rosen <ramirose at gmail.com>
Date: Tue Aug 5 01:21:22 2008 -0700
bridge: fix compile warning in net/bridge/br_netfilter.c
This patch fixes the following warning due to incompatible pointer
assignment:
net/bridge/br_netfilter.c: In function 'br_netfilter_rtable_init':
net/bridge/br_netfilter.c:116: warning: assignment from incompatible
pointer type
This warning is due to commit 4adf0af6818f3ea52421dc0bae836cfaf20ef72a
from July 30 (send correct MTU value in PMTU (revised)).
Signed-off-by: Rami Rosen <ramirose at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 95c3e8bfcdea8676e2d4d61910c379f4502049bf
Author: Rami Rosen <ramirose at gmail.com>
Date: Tue Aug 5 01:19:50 2008 -0700
ipv4: remove unused field in struct flowi (include/net/flow.h).
This patch removes an unused field (flags) from struct flowi; it seems
that this "flags" field was used once in the past for multipath
routing with FLOWI_FLAG_MULTIPATHOLDROUTE flag (which does no longer
exist); however, the "flags" field of struct flowi is not used
anymore.
Signed-off-by: Rami Rosen <ramirose at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 2f751b67a8be698cec52f786910ef4f0beffe9a7
Author: Matt Carlson <mcarlson at broadcom.com>
Date: Mon Aug 4 23:17:34 2008 -0700
tg3: Fix 'scheduling while atomic' errors
This patch fixes the 'scheduling while atomic' errors introduced by
commit 12dac0756d357325b107fe6ec24921ec38661839 ("tg3: adapt tg3 to
use reworked PCI PM code").
The first hunk of the patch removes an unnecessary
tg3_set_power_state() call. The chip will already be in the D0 state
either due to a chip reset or through a previous call to
tg3_set_power_state().
The second hunk of the patch moves the tg3_set_power_state() call
outside the critical section guarded by tg3_full_lock() and
tg3_full_unlock() functions. The power state of the device is and
should be outside the lock's domain and all other
tg3_set_power_state() calls support this.
Signed-off-by: Matt Carlson <mcarlson at broadcom.com>
Signed-off-by: Michael Chan <mchan at broadcom.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit cc6533e98a7f3cb7fce9d740da49195c7aa523a4
Author: David S. Miller <davem at davemloft.net>
Date: Mon Aug 4 23:04:08 2008 -0700
net: Kill plain NET_XMIT_BYPASS.
dst_input() was doing something completely absurd, looping
on skb->dst->input() if NET_XMIT_BYPASS was seen, but these
functions never return such an error.
And as a result plain ole' NET_XMIT_BYPASS has no more
references and can be completely killed off.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c27f339af90bb874a7a9c680b17abfd32d4a727b
Author: Jarek Poplawski <jarkao2 at gmail.com>
Date: Mon Aug 4 22:39:11 2008 -0700
net_sched: Add qdisc __NET_XMIT_BYPASS flag
Patrick McHardy <kaber at trash.net> noticed that it would be nice to
handle NET_XMIT_BYPASS by NET_XMIT_SUCCESS with an internal qdisc flag
__NET_XMIT_BYPASS and to remove the mapping from dev_queue_xmit().
David Miller <davem at davemloft.net> spotted a serious bug in the first
version of this patch.
Signed-off-by: Jarek Poplawski <jarkao2 at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 378a2f090f7a478704a372a4869b8a9ac206234e
Author: Jarek Poplawski <jarkao2 at gmail.com>
Date: Mon Aug 4 22:31:03 2008 -0700
net_sched: Add qdisc __NET_XMIT_STOLEN flag
Patrick McHardy <kaber at trash.net> noticed:
"The other problem that affects all qdiscs supporting actions is
TC_ACT_QUEUED/TC_ACT_STOLEN getting mapped to NET_XMIT_SUCCESS
even though the packet is not queued, corrupting upper qdiscs'
qlen counters."
and later explained:
"The reason why it translates it at all seems to be to not increase
the drops counter. Within a single qdisc this could be avoided by
other means easily, upper qdiscs would still increase the counter
when we return anything besides NET_XMIT_SUCCESS though.
This means we need a new NET_XMIT return value to indicate this to
the upper qdiscs. So I'd suggest to introduce NET_XMIT_STOLEN,
return that to upper qdiscs and translate it to NET_XMIT_SUCCESS
in dev_queue_xmit, similar to NET_XMIT_BYPASS."
David Miller <davem at davemloft.net> noticed:
"Maybe these NET_XMIT_* values being passed around should be a set of
bits. They could be composed of base meanings, combined with specific
attributes.
So you could say "NET_XMIT_DROP | __NET_XMIT_NO_DROP_COUNT"
The attributes get masked out by the top-level ->enqueue() caller,
such that the base meanings are the only thing that make their
way up into the stack. If it's only about communication within the
qdisc tree, let's simply code it that way."
This patch is trying to realize these ideas.
Signed-off-by: Jarek Poplawski <jarkao2 at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ca5de404ff036a29b25e9a83f6919c9f606c5841
Author: Nick Piggin <npiggin at suse.de>
Date: Sat Aug 2 12:02:13 2008 +0200
fs: rename buffer trylock
Like the page lock change, this also requires name change, so convert the
raw test_and_set bitop to a trylock.
Signed-off-by: Nick Piggin <npiggin at suse.de>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 529ae9aaa08378cfe2a4350bded76f32cc8ff0ce
Author: Nick Piggin <npiggin at suse.de>
Date: Sat Aug 2 12:01:03 2008 +0200
mm: rename page trylock
Converting page lock to new locking bitops requires a change of page flag
operation naming, so we might as well convert it to something nicer
(!TestSetPageLocked_Lock => trylock_page, SetPageLocked => set_page_locked).
This also facilitates lockdeping of page lock.
Signed-off-by: Nick Piggin <npiggin at suse.de>
Acked-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Acked-by: Peter Zijlstra <peterz at infradead.org>
Acked-by: Andrew Morton <akpm at linux-foundation.org>
Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit e9ba9698187ddbc0c5bfcf41de0349a662d23d02
Merge: 2e1e9212ed8c532c6b324de77d3cafef5d2bc846 ae583885bfd07474789059cdef399289bd66c8d0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Aug 4 19:04:36 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Remove all cpumask_t local variables in xcall dispatch.
sparc64: Kill error_mask from hypervisor_xcall_deliver().
sparc64: Build cpu list and mondo block at top-level xcall_deliver().
sparc64: Disable local interrupts around xcall_deliver_impl() invocation.
sparc64: Make all xcall_deliver's go through common helper function.
sparc64: Always allocate the send mondo blocks, even on non-sun4v.
sparc64: Make smp_cross_call_masked() take a cpumask_t pointer.
sparc64: Directly call xcall_deliver() in smp_start_sync_tick_client.
sparc64: Call xcall_deliver() directly in some cases.
sparc64: Use cpumask_t pointers and for_each_cpu_mask_nr() in xcall_deliver.
sparc64: Use xcall_deliver() consistently.
sparc64: Use function pointer for cross-call sending.
arch/sparc64/kernel/signal.c: removed duplicated #include
sparc64: Need to disable preemption around smp_tsb_sync().
commit 214c6a7ed13e01cab2addeef56124067e4d20147
Author: Eric Miao <eric.miao at marvell.com>
Date: Tue Jul 29 14:39:34 2008 +0800
[ARM] sa1100_wdt: use reset_status to remember watchdog reset status
Signed-off-by: Eric Miao <eric.miao at marvell.com>
commit 04fef228fb00dd79475a2313f4ba73b4fbfe2faa
Author: Eric Miao <eric.miao at marvell.com>
Date: Tue Jul 29 14:26:00 2008 +0800
[ARM] pxa: introduce reset_status and clear_reset_status for driver's usage
Due to the problem of reset status bits being handled by different
registers between pxa2xx and pxa3xx, introduce a global reset_status
variable, initialized by SoC-specific code and later being used by
other drivers.
And also introduce clear_reset_status(), which is used to clear the
corresponding status bits. Pass RESET_STATUS_ALL to clear all bits.
Signed-off-by: Eric Miao <eric.miao at marvell.com>
commit ab277121426edca2ee0601fc6318c9467350771e
Author: Eric Miao <eric.miao at marvell.com>
Date: Tue Jul 29 14:08:14 2008 +0800
[ARM] pxa: introduce reset.h for reset specific header information
Signed-off-by: Eric Miao <eric.miao at marvell.com>
commit 2e1e9212ed8c532c6b324de77d3cafef5d2bc846
Merge: 2acb802b0c5485aedb46e23b2b45e49573454c09 f5663f5bded3364158e2d31904173cb1debc2ecd
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Aug 4 17:26:15 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (29 commits)
sh: enable maple_keyb in dreamcast_defconfig.
SH2(A) cache update
nommu: Provide vmalloc_exec().
add addrespace definition for sh2a.
sh: Kill off ARCH_SUPPORTS_AOUT and remnants of a.out support.
sh: define GENERIC_HARDIRQS_NO__DO_IRQ.
sh: define GENERIC_LOCKBREAK.
sh: Save NUMA node data in vmcore for crash dumps.
sh: module_alloc() should be using vmalloc_exec().
sh: Fix up __bug_table handling in module loader.
sh: Add documentation and integrate into docbook build.
sh: Fix up broken kerneldoc comments.
maple: Kill useless private_data pointer.
maple: Clean up maple_driver_register/unregister routines.
input: Clean up maple keyboard driver
maple: allow removal and reinsertion of keyboard driver module
sh: /proc/asids depends on MMU.
arch/sh/boards/mach-se/7343/irq.c: removed duplicated #include
arch/sh/boards/board-ap325rxa.c: removed duplicated #include
sh/boards/Makefile typo fix
...
commit 2acb802b0c5485aedb46e23b2b45e49573454c09
Merge: d8f4b819c3a5b54a978c6fe5249a17cff490c4a1 9c4cb82515130c62224e23fdf7c13c8f6c59c614
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Aug 4 17:25:06 2008 -0700
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
powerpc: Remove use of CONFIG_PPC_MERGE
powerpc: Force printing of 'total_memory' to unsigned long long
powerpc: Fix compiler warning in arch/powerpc/mm/mem.c
powerpc: Move include files to arch/powerpc/include/asm
commit d8f4b819c3a5b54a978c6fe5249a17cff490c4a1
Merge: 115a326c1e5cab457924356123bbfd7d783ecf9d f072181e6403b0fe2e2aa800a005497b748fd284
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Aug 4 17:24:28 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kconfig: drop the ""trying to assign nonexistent symbol" warning
kconfig: always write out .config
commit 115a326c1e5cab457924356123bbfd7d783ecf9d
Author: Roland McGrath <roland at redhat.com>
Date: Mon Aug 4 13:56:01 2008 -0700
tracehook: kerneldoc fix
My last change to tracehook.h made it confuse the kerneldoc parser.
Move the #define's before the comment so it's happy again.
Signed-off-by: Roland McGrath <roland at redhat.com>
Acked-by: Randy Dunlap <randy.dunlap at oracle.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 18f6db95dcfa68e93bafe435381299abbffb5c7e
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 11:21:23 2008 +0100
mn10300: Fix up __bug_table handling in module loader.
Platforms that are using GENERIC_BUG must call in to
module_bug_finalize()/module_bug_cleanup() in order to scan modules with
their own __bug_table sections that are otherwise unaccounted.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
Signed-off-by: David Howells <dhowells at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b13ad6f47c172761a3ce06f0fd12d19118b3076c
Merge: f1b134fdf6d36c975b4a66cf952565cd73aebdba 1a61c88defcd611bd148d6c960b498e1b8bbbe00
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Aug 4 17:21:38 2008 -0700
Merge branch 'audit.b56' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b56' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current:
Re: [PATCH] Fix the kernel panic of audit_filter_task when key field is set
commit f1b134fdf6d36c975b4a66cf952565cd73aebdba
Merge: 7274264f60cc0b71389efed286001ff0860c3141 e8bac9e0647dd04c83fd0bfe7cdfe2f6dfb100d0
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Aug 4 17:19:18 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] scsi_transport_spi: fix oops in revalidate
[SCSI] ses: fix VPD inquiry overrun
[SCSI] block: Fix miscalculation of sg_io timeout in CDROM_SEND_PACKET handler.
[SCSI] hptiop: add more PCI device IDs
commit 7274264f60cc0b71389efed286001ff0860c3141
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Sun Aug 3 22:02:10 2008 +0200
m68k: some asm-sparc include files moved
So copy their contents into the asm-m68k files.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 725aad24c3ba96a7c06448c14c265a466cdbd663
Author: Jeremy Fitzhardinge <jeremy at goop.org>
Date: Sun Aug 3 09:33:03 2008 -0700
__sched_setscheduler: don't do any policy checks when not "user"
The "user" parameter to __sched_setscheduler indicates whether the
change is being done on behalf of a user process or not. If not, we
shouldn't apply any permissions checks, so don't call
security_task_setscheduler().
Signed-off-by: Jeremy Fitzhardinge <jeremy at goop.org>
Tested-by: Steve Wise <swise at opengridcomputing.com>
Cc: Rusty Russell <rusty at rustcorp.com.au>
Cc: "Rafael J. Wysocki" <rjw at sisk.pl>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5941de8eadc287f3f47b87ce9888734ee07d210b
Merge: c44df7413fd711bca818111b94cbd7ce5f3600a9 c6557e7f2b6ae76a44653d38f835174074c42e05
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Aug 4 17:15:07 2008 -0700
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] move include/asm-s390 to arch/s390/include/asm
commit c44df7413fd711bca818111b94cbd7ce5f3600a9
Merge: 103a1d5c57fac3623613b130b104f5b03367b31c 0e09c863dbb8b1816ebc106df1a1cae4c588ce0e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Aug 4 17:14:21 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
pcmcia: rsrc_nonstatic: check value, not pointer
commit 103a1d5c57fac3623613b130b104f5b03367b31c
Author: Alan Cox <alan at redhat.com>
Date: Mon Aug 4 17:56:28 2008 +0100
sc1200 watchdog driver: Fix locking, sems and coding style
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 81830061bbae282d37c9af30084a1116b6239520
Author: Andrew Morton <akpm at linux-foundation.org>
Date: Mon Aug 4 17:56:02 2008 +0100
alpha: Fix breakage in wdt_pci
drivers/watchdog/wdt_pci.c: In function 'wdtpci_ctr_mode':
drivers/watchdog/wdt_pci.c:120: error: implicit declaration of function 'udelay'
{standard input}: Assembler messages:
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 9f2d1f0da766f84fdb96c9bd79ed0f97036635cb
Author: Alan Cox <alan at redhat.com>
Date: Mon Aug 4 17:55:35 2008 +0100
wdt: Cleanup and sort out locking and inb_p
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 41dc8b72e37c514f7332cbc3f3dd864910c2a1fa
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Mon Aug 4 17:54:46 2008 +0100
s3c2410_wdt watchdog driver: Locking and coding style
Kill off use of semaphores.
Fix ioctl races and locking holes.
From: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d6547378df1c11bc6790b87abedb3526ded40ef9
Author: Alan Cox <alan at redhat.com>
Date: Mon Aug 4 17:54:01 2008 +0100
it8712f_wdt: Locking and coding style
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 670d59c0ae31a872341785b1d93add284c1653ff
Author: Alan Cox <alan at redhat.com>
Date: Mon Aug 4 17:53:22 2008 +0100
ar7_wdt watchdog driver: Fix locking
Use unlocked_ioctl
Remove semaphores
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d5cae364148088911bdf007a8aaefb46a92f16f7
Author: Alan Cox <alan at redhat.com>
Date: Mon Aug 4 17:47:07 2008 +0100
vt: Deadlock workaround
2.6.26 corrected the mutex locking on tty resizing to fix the case where
you could get the tty/vt sizing out of sync. That turns out to have a
deadlock.
The actual fix is really major and I've got it lined up as part of the ops
changes for 2.6.28 so for 2.6.26/2.6.27 it is safer to reintroduce this
ages old minor bug.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit d7283353221e73a793847252d063ff9186885160
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Mon Aug 4 17:21:18 2008 +0100
cris: Fixup compile problems
It now compiles with the tty changes but isn't tested (which has to be
better than not compiling..
Closes bug #11218
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit b1cbefe5d5fc2d4a6109961d914027172ce8e152
Author: Alan Cox <alan at lxorguk.ukuu.org.uk>
Date: Mon Aug 4 17:22:11 2008 +0100
blackfin: Fix compile failure in tty code
Blackfin peers into the ldisc in an odd way for IRDA snooping which
therefore got missed. Simple enough fix.
Closes bug #11233
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c635fd3d3de9dec4729135add72c2ff32595605b
Merge: 82e68f7ffec3800425f2391c8c86277606860442 cf368d2f9aced8adc8bd6b1f04294a71551d5fce
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Aug 4 17:03:56 2008 -0700
Merge git://git.infradead.org/users/dwmw2/random-2.6
* git://git.infradead.org/users/dwmw2/random-2.6:
drivers/video/console/promcon.c: fix build error
Fix IHEX firmware generation/loading
commit 82e68f7ffec3800425f2391c8c86277606860442
Author: Willy Tarreau <w at 1wt.eu>
Date: Sat Aug 2 18:25:16 2008 +0200
sound: ensure device number is valid in snd_seq_oss_synth_make_info
snd_seq_oss_synth_make_info() incorrectly reports information
to userspace without first checking for the validity of the
device number, leading to possible information leak (CVE-2008-3272).
Reported-By: Tobias Klein <tk at trapkit.de>
Acked-and-tested-by: Takashi Iwai <tiwai at suse.de>
Cc: stable at kernel.org
Signed-off-by: Willy Tarreau <w at 1wt.eu>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 82248a5e92793014d156a12dbcbba633794ce9f8
Merge: c2d5cedadcd3976cfc1fa5590e3a73a059c6401a 31981db0d0b665713ab3e9531f936fdb67947225
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Aug 4 17:00:37 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
Add DIP switch readout for HFC-4S IOB4ST
Fix remaining big endian issue of hfcmulti
mISDN cleanup user interface
mISDN fix main ISDN Makefile
commit c2d5cedadcd3976cfc1fa5590e3a73a059c6401a
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date: Sat Aug 2 21:10:23 2008 +0800
drivers/char/efirtc.c: removed duplicated #include
Removed duplicated include <linux/smp_lock.h> in
drivers/char/efirtc.c.
Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit a477097d9c37c1cf289c7f0257dffcfa42d50197
Author: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Date: Mon Aug 4 13:41:14 2008 -0700
mlock() fix return values
Halesh says:
Please find the below testcase provide to test mlock.
Test Case :
===========================
#include <sys/resource.h>
#include <stdio.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/mman.h>
#include <fcntl.h>
#include <errno.h>
#include <stdlib.h>
int main(void)
{
int fd,ret, i = 0;
char *addr, *addr1 = NULL;
unsigned int page_size;
struct rlimit rlim;
if (0 != geteuid())
{
printf("Execute this pgm as root\n");
exit(1);
}
/* create a file */
if ((fd = open("mmap_test.c",O_RDWR|O_CREAT,0755)) == -1)
{
printf("cant create test file\n");
exit(1);
}
page_size = sysconf(_SC_PAGE_SIZE);
/* set the MEMLOCK limit */
rlim.rlim_cur = 2000;
rlim.rlim_max = 2000;
if ((ret = setrlimit(RLIMIT_MEMLOCK,&rlim)) != 0)
{
printf("Cant change limit values\n");
exit(1);
}
addr = 0;
while (1)
{
/* map a page into memory each time*/
if ((addr = (char *) mmap(addr,page_size, PROT_READ |
PROT_WRITE,MAP_SHARED,fd,0)) == MAP_FAILED)
{
printf("cant do mmap on file\n");
exit(1);
}
if (0 == i)
addr1 = addr;
i++;
errno = 0;
/* lock the mapped memory pagewise*/
if ((ret = mlock((char *)addr, 1500)) == -1)
{
printf("errno value is %d\n", errno);
printf("cant lock maped region\n");
exit(1);
}
addr = addr + page_size;
}
}
======================================================
This testcase results in an mlock() failure with errno 14 that is EFAULT,
but it has nowhere been specified that mlock() will return EFAULT. When I
tested the same on older kernels like 2.6.18, I got the correct result i.e
errno 12 (ENOMEM).
I think in source code mlock(2), setting errno ENOMEM has been missed in
do_mlock() , on mlock_fixup() failure.
SUSv3 requires the following behavior frmo mlock(2).
[ENOMEM]
Some or all of the address range specified by the addr and
len arguments does not correspond to valid mapped pages
in the address space of the process.
[EAGAIN]
Some or all of the memory identified by the operation could not
be locked when the call was made.
This rule isn't so nice and slighly strange. but many people think
POSIX/SUS compliance is important.
Reported-by: Halesh Sadashiv <halesh.sadashiv at ap.sony.com>
Tested-by: Halesh Sadashiv <halesh.sadashiv at ap.sony.com>
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro at jp.fujitsu.com>
Cc: <stable at kernel.org> [2.6.25.x, 2.6.26.x]
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit dc329442b9fd365bec95718013586c07ff600c34
Author: Gerard Kam <gerardk5 at verizon.net>
Date: Mon Aug 4 13:41:12 2008 -0700
atmel_spi: fix hang due to missed interrupt
For some time my at91sam9260 board with JFFS2 on serial flash (m25p80)
would hang when accessing the serial flash and SPI bus. Slowing the SPI
clock down to 9 MHz reduced the occurrence of the hang from "always"
during boot to a nuisance level that allowed other SW development to
continue. Finally had to address this issue when an application stresses
the I/O to always cause a hang.
Hang seems to be caused by a missed SPI interrupt, so that the task ends
up waiting forever after calling spi_sync(). The fix has 2 parts. First
is to halt the DMA engine before the "current" PDC registers are loaded.
This ensures that the "next" registers are loaded before the DMA operation
takes off. The second part of the fix is a kludge that adds a
"completion" interrupt in case the ENDRX interrupt for the last segment of
the DMA chaining operation was missed.
The patch allows the SPI clock for the serial flash to be increased from 9
MHz to 15 MHz (or more?). No hangs or SPI overruns were encountered.
Haavard: while this patch does indeed improve things, I still see overruns
and CRC errors on my NGW100 board when running the DataFlash at 10 MHz.
However, I think some improvement is better than nothing, so I'm passing
this on for inclusion in 2.6.27.
Signed-off-by: Gerard Kam <gerardk5 at verizon.net>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Cc: David Brownell <david-b at pacbell.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 5aa6cf302c2758702348aab7457e516d3a5121b9
Author: Ben Dooks <ben-linux at fluff.org>
Date: Mon Aug 4 13:41:10 2008 -0700
spi: S3C24XX: reset register status on resume.
Fix a bug in the spi_s3c24xx driver where it does not reset the registers
of the hardware when resuming from suspend (this block has been reset over
suspend).
Signed-off-by: Ben Dooks <ben-linux at fluff.org>
Signed-off-by: David Brownell <dbrownell at users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ae583885bfd07474789059cdef399289bd66c8d0
Author: David S. Miller <davem at davemloft.net>
Date: Mon Aug 4 16:56:15 2008 -0700
sparc64: Remove all cpumask_t local variables in xcall dispatch.
All of the xcall delivery implementation is cpumask agnostic, so
we can pass around pointers to const cpumask_t objects everywhere.
The sad remaining case is the argument to arch_send_call_function_ipi().
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1a3f7d98e5f50f21ce6fb1406a35531d9596c5c6
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Aug 4 16:50:38 2008 -0700
Revert "UFS: add const to parser token table"
This reverts commit f9247273cb69ba101877e946d2d83044409cc8c5 (and
fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 - "fix fs/nfs/nfsroot.c
compilation" - that fixed a missed conversion).
The changes cause problems for at least the sparc build. Let's re-do
them when the exact issues are resolved.
Requested-by: Andrew Morton <akpm at linux-foundation.org>
Requested-by: Steven Whitehouse <swhiteho at redhat.com>
Cc: David Miller <davem at davemloft.net>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit ed4d9c66eb941a416c8cb9a0138c69d46d82fc4f
Author: David S. Miller <davem at davemloft.net>
Date: Mon Aug 4 16:47:57 2008 -0700
sparc64: Kill error_mask from hypervisor_xcall_deliver().
It can eat up a lot of stack space when NR_CPUS is large.
We retain some of it's functionality by reporting at least one
of the cpu's which are seen in error state.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 90f7ae8a55190f5edfb9fda957e25c994ed39ec4
Author: David S. Miller <davem at davemloft.net>
Date: Mon Aug 4 16:42:58 2008 -0700
sparc64: Build cpu list and mondo block at top-level xcall_deliver().
Then modify all of the xcall dispatch implementations get passed and
use this information.
Now all of the xcall dispatch implementations do not need to be mindful
of details such as "is current cpu in the list?" and "is cpu online?"
Signed-off-by: David S. Miller <davem at davemloft.net>
commit fca082c9f1e11ec07efa8d2f9f13688521253f36
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Mon Aug 4 16:36:20 2008 -0700
Revert "[SCSI] extend the last_sector_bug flag to cover more sectors"
This reverts commit 2b142900784c6e38c8d39fa57d5f95ef08e735d8, since it
seems to break some other USB storage devices (at least a JMicron USB to
ATA bridge). As such, while it apparently fixes some cardreaders, it
would need to be made conditional on the exact reader it fixes in order
to avoid causing regressions.
Cc: Alan Jenkins <alan-jenkins at tuffmail.co.uk>
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit c02a5119e862dea9a1361182840d41ae1fe24227
Author: David S. Miller <davem at davemloft.net>
Date: Mon Aug 4 16:18:40 2008 -0700
sparc64: Disable local interrupts around xcall_deliver_impl() invocation.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit deb16999e452b74011dac5b2fe0d6258df81a2a1
Author: David S. Miller <davem at davemloft.net>
Date: Mon Aug 4 16:16:20 2008 -0700
sparc64: Make all xcall_deliver's go through common helper function.
This just facilitates the next changeset where we'll be building
the cpu list and mondo block in this helper function.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 43f589235e223418d5807ebcddca73ec8a45f52c
Author: David S. Miller <davem at davemloft.net>
Date: Mon Aug 4 16:13:51 2008 -0700
sparc64: Always allocate the send mondo blocks, even on non-sun4v.
The idea is that we'll use this cpu list array and mondo block
even for non-hypervisor platforms.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit bcbd2b65868213c1426654304de3da330cde6b3a
Author: Tony Luck <tony.luck at intel.com>
Date: Mon Aug 4 15:47:25 2008 -0700
[IA64] Update generic config
Changes to support a new platform in my lab.
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 91a4231cc2efb9134373bb2a93be96a284955607
Author: David S. Miller <davem at davemloft.net>
Date: Mon Aug 4 00:51:18 2008 -0700
sparc64: Make smp_cross_call_masked() take a cpumask_t pointer.
Ideally this could be simplified further such that we could pass
the pointer down directly into the xcall_deliver() implementation.
But if we do that we need to do the "cpu_online(cpu)" and
"cpu != self" checks down in those functions.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 24445a4ac9d3fdd3f96f0ad277cb2ba274470d94
Author: David S. Miller <davem at davemloft.net>
Date: Mon Aug 4 00:02:31 2008 -0700
sparc64: Directly call xcall_deliver() in smp_start_sync_tick_client.
We know the cpu is online and not the current cpu here.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 199266305311d060b6e057fa5c7de01f218bb911
Author: David S. Miller <davem at davemloft.net>
Date: Sun Aug 3 23:56:28 2008 -0700
sparc64: Call xcall_deliver() directly in some cases.
For these cases the callers make sure:
1) The cpus indicated are online.
2) The current cpu is not in the list of indicated cpus.
Therefore we can pass a pointer to the mask directly.
One of the motivations in this transformation is to make use of
"&cpumask_of_cpu(cpu)" which evaluates to a pointer to constant
data in the kernel and thus takes up no stack space.
Hopefully someone in the future will change the interface of
arch_send_call_function_ipi() such that it passes a const cpumask_t
pointer so that this will optimize ever further.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit cd5bc89debb4045d55eeffe325b97f2dfba4ddea
Author: David S. Miller <davem at davemloft.net>
Date: Sun Aug 3 23:24:26 2008 -0700
sparc64: Use cpumask_t pointers and for_each_cpu_mask_nr() in xcall_deliver.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 622824dbb536f7bdc241eefc3e1ae31c463b4eb8
Author: David S. Miller <davem at davemloft.net>
Date: Sun Aug 3 23:07:18 2008 -0700
sparc64: Use xcall_deliver() consistently.
There remained some spots still vectoring to the appropriate
*_xcall_deliver() function manually.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5e0797e5b84408a13260a107e2f7a49ee6342ae4
Author: David S. Miller <davem at davemloft.net>
Date: Sun Aug 3 22:52:41 2008 -0700
sparc64: Use function pointer for cross-call sending.
Initialize it using the smp_setup_processor_id() hook.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit abd9e6982815ad7bd2c70dbf4cc0c08b48229d6e
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date: Sun Aug 3 00:04:13 2008 -0700
arch/sparc64/kernel/signal.c: removed duplicated #include
Removed duplicated #include <linux/tracehook.h> in
arch/sparc64/kernel/signal.c.
Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a3cf5e6b6f2548b036921da5ab6325dc8a76e207
Author: David S. Miller <davem at davemloft.net>
Date: Sun Aug 3 00:01:05 2008 -0700
sparc64: Need to disable preemption around smp_tsb_sync().
Based upon a bug report by Mariusz Kozlowski
It uses smp_call_function_masked() now, which has a preemption-disabled
requirement.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit ee694d6b4106ca09dcf23f839b44efd152a1da82
Author: Tony Luck <tony.luck at intel.com>
Date: Mon Aug 4 13:39:28 2008 -0700
[IA64] Fix uniprocessor build w.r.t. SGI_XP and SGI_GRU
The SGI XP and GRU drivers only work on SMP systems ... the Kconfig
file only disallowed them for non-SMP X86.
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit f072181e6403b0fe2e2aa800a005497b748fd284
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Mon Aug 4 22:29:37 2008 +0200
kconfig: drop the ""trying to assign nonexistent symbol" warning
They really stand out now that make *config is less chatty - and
they are generally ignored - so drop them.
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Roman Zippel <zippel at linux-m68k.org>
Cc: Adrian Bunk <bunk at kernel.org>
commit 22127f246dc37ed5bea0915f7860002ba6d87da7
Author: Sam Ravnborg <sam at ravnborg.org>
Date: Mon Aug 4 22:18:07 2008 +0200
kconfig: always write out .config
Always write out .config also in the case where config
did not change.
This fixes: http://bugzilla.kernel.org/show_bug.cgi?id=11230
Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
Cc: Josh Boyer <jwboyer at linux.vnet.ibm.com>
Cc: Adrian Bunk <bunk at kernel.org>
commit 3e2236c108792c3afbbfbe3f373ee7fdd68eda8e
Author: Zhu Yi <yi.zhu at intel.com>
Date: Mon Aug 4 16:00:48 2008 +0800
iwl3945: fix merge mistake for packet injection
We should allow packets transmission in monitor mode for 3945. The
patch fixes a merge error with 2.6.26 kernel.
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 2d3db679511be102741cb2d5f8c2b8a1ededdee7
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Mon Aug 4 16:00:47 2008 +0800
iwlwifi: grap nic access before accessing periphery registers
We need to grap nic access before accessing periphery registers.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 14652562364dad636ddce2cd11e71702ca21bfbd
Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
Date: Mon Aug 4 16:00:46 2008 +0800
iwlwifi: decrement rx skb counter in scan abort handler
This patch decrements rx skb counter in scan abort handler.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit c1842d6150c4efe1d01e7a8cf86c63aec6223486
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Mon Aug 4 16:00:43 2008 +0800
iwlwifi: fix unhandled interrupt when HW rfkill is on
This patch fixes unhandled interrupt when HW rfkill is on during
devices start up. The behavior changes, now open is successful even
when rfkill is on. This is to align with the situation when rfkill
is set on after opening.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit caab8f1a5d0da583b6ffe41afea2774c676444ca
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Mon Aug 4 16:00:42 2008 +0800
iwlwifi: implement iwl5000_calc_rssi
This patch implements rssi calculation for 5000 HW.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit da99c4b6c25964b90c79f19beccda208df1a865a
Author: Gregory Greenman <gregory.greenman at intel.com>
Date: Mon Aug 4 16:00:40 2008 +0800
iwlwifi: memory allocation optimization
This patch optimizes memory allocation. The cmd member of
iwl_tx_queue was allocated previously as a continuous block
of memory. This patch allocates separate memory chunks for each command
and maps/unmaps these chunks in the run time.
Signed-off-by: Gregory Greenman <gregory.greenman at intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 4c43e0d0ecd5196ed5c67f64ed2f1860770eed34
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Mon Aug 4 16:00:39 2008 +0800
iwlwifi: HW bug fixes
This patch adds few HW bug fixes.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 6041e2a08c50e3fcaf1e56422bfafda62c597cea
Author: Larry Finger <Larry.Finger at lwfinger.net>
Date: Sun Aug 3 17:58:36 2008 -0500
p54: Fix potential concurrent access to private data
Experience with the rtl8187 driver has shown that mac80211 can make
calls to the config callback routine in rapid succession. This patch
creates a mutex that protects the private data in several of the routines
called by mac80211.
Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit d06193f311102b2c990ec5f66b470ea49ecc73a4
Author: Ivo van Doorn <IvDoorn at gmail.com>
Date: Sun Aug 3 23:36:01 2008 +0200
rt2x00: Disable link tuning in rt2500usb
In the legacy rt2570 driver the link tuner was never
really called. And now the reason has finally become
apparent: It breaks TX capabilities
As soon as the device has been associated all following
TX frames will be queued in the hardware and never transmitted
to the air. Disabling sections of the link tuner did not
have the expected result, but completely disabling the
link tuner did have the right result (Both of my rt2570 devices
came back to life).
This should fix Fedora bug: 411481
v2: Fix typos
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 5cbbb376d65ed181ed290cea505ba37a0425ee25
Author: Sven Wegener <sven.wegener at stealer.net>
Date: Fri Aug 1 21:57:16 2008 +0200
iwlwifi: Don't use buffer allocated on the stack for led names
Having the buffer on the stack and even re-using it for all led devices is bad.
Not being able to resolve the name member of the led device structure to a
meaningful value leads to confusion during ad-hoc debugging and potential
breakage in the future, if we ever decide to access the name member outside of
the registration function. Move the buffer to our private per led device
structures so that it is accessible after registration.
A quick grep didn't yield any occurence of using the led device name parameter
outside of the led device registration function, so currently we should already
be safe for normal operation.
Signed-off-by: Sven Wegener <sven.wegener at stealer.net>
Cc: Richard Purdie <rpurdie at rpsys.net>
Acked-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 4fc22b21b3fcb3580c32b70605ef114178f8e611
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Mon Jul 21 18:54:42 2008 +0300
iwlwifi: rename 4965 to AGN
This patch renames driver name from 4965 to AGN
The driver supports both 4965AGN and 5000AGN family
The driver's original module name iwl4965.ko remains as an alias
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 3ac7f14694dd38273d9d96f1c873233d71190c15
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Mon Jul 21 02:40:14 2008 +0300
iwlwifi: fix checkpatch.pl errors
This patch fixes errors reported by checkpatch in iwlwifi drivers
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 25bc2deda9e8a430ed49f507a1120fb2c86abf33
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Mon Jul 21 02:40:13 2008 +0300
iwlwifi: rename iwl4965-base.c to iwl-agn.c
This patch renames iwl4965-base.c to iwl-agn.c
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 80693ceb78b08baa3b66a900d9225b2cf9c6f0ed
Author: Daniel Drake <dsd at gentoo.org>
Date: Sat Jul 19 23:31:17 2008 +0100
mac80211: automatic IBSS channel selection
When joining an ad-hoc network, the user is currently required to specify
the channel. The network will not be joined otherwise, unless it happens
to be sitting on the currently active channel.
This patch implements automatic channel selection when the user has not
locked the interface onto a specific channel.
Signed-off-by: Daniel Drake <dsd at gentoo.org>
Acked-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit b5d7be5e665f29274cfe6645b661acb38cb1d19b
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Sat Jul 19 04:41:24 2008 +0300
iwlwifi: use dtim_period from association, and set listen_interval
This patch uses dtim_period from association, and sets the listen_interval.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit e170402e5459c12ed8f5bfaa11e6550eba09e57a
Author: Denis V. Lunev <den at openvz.org>
Date: Sat Jul 19 04:04:18 2008 +0300
iwlwifi: RS small compile warnings without CONFIG_IWLWIFI_DEBUG
iwl-agn-rs.c: In function 'rs_clear':
iwl-agn-rs.c:2405: warning: unused variable 'priv
Signed-off-by: Denis V. Lunev <den at openvz.org>
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 4aa41f12aa4f08a10b0b07ed334faa3638ba8e9c
Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
Date: Fri Jul 18 13:53:09 2008 +0800
iwlwifi: bug fix in AGG flow - cast const to ULL
This patch fixes a bug in AGG flow:
u64 bitmap = 0;
bitmap |= 1 << 32 results to be 0xffffffff80000000.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit c785d1d5018b93878a9280b0c04df96682cc6eff
Author: Esti Kummer <ester.kummer at intel.com>
Date: Fri Jul 18 13:53:07 2008 +0800
iwlwifi: set led register in disassociation
This patch sets the led register in disassociation flow according to
rf-kill state : off - in case of rf_kill, on - otherwise.
Signed-off-by: Esti Kummer <ester.kummer at intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 3ce84b9f2f495f59c4a4e68d814c348eaa497f65
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Fri Jul 18 13:53:06 2008 +0800
iwlwifi: kill iwl4965_fill_rs_info
iwl4965_fill_rs_info was used in sysfs. This info is already present
in iwl-agn-rs debugfs.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit e227ceac8429ecd775c213838f0415700727b7b4
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Fri Jul 18 13:53:05 2008 +0800
iwlwifi: rename iwl-4695-rs to iwl-agn-rs
This patch renames iwl-4965-rs to iwl-agn-rs as it provides
rate scale capability for all AGN capable iwlwifi drivers.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit e2e3c57b271d74ed8fd4d378f1517525ef7e5921
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Fri Jul 18 13:53:04 2008 +0800
iwlwifi: move iwl4965_set_pwr_src to iwl4965-base.c
This patch moves iwl4965_set_pwr_src to iwl4965-base.c.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 4bf64efd26f5610cde4fb7846e2f37bd1f62d3a9
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Fri Jul 18 13:53:03 2008 +0800
iwlwifi: move beacon handling to iwl4965-base.c
This patch concentrates becaon handling in iwl4965-base.c.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit d783b061077f92af55244aef1df8780b0f46b5af
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Fri Jul 18 13:53:02 2008 +0800
iwlwifi: move iwl4965_mac_ampdu_action to iwl4965-base.c
This patch moves iwl4965_mac_ampdu_action to iwl4965-base.c.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit ea95bba41e69c616bb1512cf59d22f33266b8568
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Fri Jul 18 13:53:00 2008 +0800
mac80211: make listen_interval be limited by low level driver
This patch makes possible for a driver to specify maximal listen interval
The possibility for user to configure listen interval is not implemented
yet, currently the maximum provided by the driver or 1 is used.
Mac80211 uses config handler to set listen interval for to the driver.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 98f7dfd86cbbd377e2cbc293529681b914296f68
Author: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
Date: Fri Jul 18 13:52:59 2008 +0800
mac80211: pass dtim_period to low level driver
This patch adds the dtim_period in ieee80211_bss_conf, this allows the low
level driver to know the dtim_period, and to plan power save accordingly.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach at intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Acked-by: Johannes Berg <johannes at sipsolutions.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 298df1f62aa69881528bf0f1c3c14395bc447846
Author: Esti Kummer <stkumer at localhost.localdomain>
Date: Fri Jul 18 13:52:58 2008 +0800
iwlwifi: corrects power_level in sysfs
This patch corrects power_level in sysfs.
Signed-off-by: Esti Kummer <ester.kummer at intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit ca579617d81baf5865498eb5fae58e453ee77c2c
Author: Mohamed Abbas <mohamed.abbas at intel.com>
Date: Fri Jul 18 13:52:57 2008 +0800
iwlwifi: add power save to 5000 HW
This patch adds support for power save for 5000 HW.
Signed-off-by: Mohamed Abbas <mohamed.abbas at intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: Zhu Yi <yi.zhu at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 3351ab9b345ba5c2872acbf718cc631df72d3732
Author: Jack Steiner <steiner at sgi.com>
Date: Thu Jul 31 07:52:50 2008 -0500
[IA64] Eliminate trailing backquote in IA64_SGI_UV
Eliminate trailing backquote in IA64_SGI_UV config.
Signed-off-by: Jack Steiner <steiner at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit ceffacc1d6041392d1b47750b14bf6845c2372ab
Author: Robin Holt <holt at sgi.com>
Date: Sat Aug 2 13:35:27 2008 -0500
[IA64] update generic_defconfig to support sn2.
This patch changes the generic_defconfig so it works on all sn2
platforms I have access to. There is only one support configuration
which was not tested and that configuration is only a combination of two
tested configurations. With this patchset applied, a generic kernel can
be booted on either a RHEL 5.2, RHEL5.3, or SLES10 SP1 root and operate.
All features needed by SGI's ProPack are also working. I have not
tested all features of RHEL or SLES, but they do at least boot.
Signed-off-by: Robin Holt <holt at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 70117b9e866b1fdf7e4e84ffb6f38a7b3e9702f8
Author: Alexander Beregalov <a.beregalov at gmail.com>
Date: Mon Aug 4 11:12:18 2008 -0700
IB/ipath: Fix printk format warnings
ipath_driver.c:1260: warning: format '%Lx' expects type 'long long unsigned int', but argument 6 has type 'long unsigned int'
ipath_driver.c:1459: warning: format '%Lx' expects type 'long long unsigned int', but argument 4 has type 'u64'
ipath_intr.c:358: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'u64'
ipath_intr.c:358: warning: format '%Lu' expects type 'long long unsigned int', but argument 6 has type 'u64'
ipath_intr.c:1119: warning: format '%Lx' expects type 'long long unsigned int', but argument 5 has type 'u64'
ipath_intr.c:1119: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'u64'
ipath_intr.c:1123: warning: format '%Lx' expects type 'long long unsigned int', but argument 3 has type 'u64'
ipath_intr.c:1130: warning: format '%Lx' expects type 'long long unsigned int', but argument 4 has type 'u64'
ipath_iba7220.c:1032: warning: format '%llx' expects type 'long long unsigned int', but argument 4 has type 'u64'
ipath_iba7220.c:1045: warning: format '%llX' expects type 'long long unsigned int', but argument 3 has type 'u64'
ipath_iba7220.c:2506: warning: format '%Lu' expects type 'long long unsigned int', but argument 4 has type 'u64'
Signed-off-by: Alexander Beregalov <a.beregalov at gmail.com>
Cc: Sean Hefty <sean.hefty at intel.com>
Cc: Hal Rosenstock <hal.rosenstock at gmail.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit ac0af91ebcaedc1a9e1d2987ecbd22837924e6b9
Author: Robin Holt <holt at sgi.com>
Date: Sat Aug 2 13:32:06 2008 -0500
[IA64] update generic_defconfig for 2.6.27-rc1
This patch updates the generic_defconfig for 2.6.27-rc1 by simply doing
a make oldconfig and holding down the carriage return.
Signed-off-by: Robin Holt <holt at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit d1339df1f46d10e0396c1470f371b0d1b23295ba
Author: Robin Holt <holt at sgi.com>
Date: Sat Aug 2 13:29:24 2008 -0500
[IA64] Allow ia64 to CONFIG_NR_CPUS up to 4096
ia64 has compiled with NR_CPUS=4096 for a couple releases, just forgot
to update Kconfig to allow it.
Signed-off-by: Robin Holt <holt at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit be43324d8b316fe83a7b4027334f2825f1121c2c
Author: Steve Wise <swise at opengridcomputing.com>
Date: Mon Aug 4 11:08:37 2008 -0700
RDMA/cxgb3: Fix deadlock initializing iw_cxgb3 device
Running 'ifconfig up' on the cxgb3 interface with iw_cxgb3 loaded
causes a deadlock. The rtnl lock is already held in this path. The
function fw_supports_fastreg() was introduced in 2.6.27 to
conditionally set the IB_DEVICE_MEM_MGT_EXTENSIONS bit iff the
firmware was at 7.0 or greater, and this function also acquires the
rtnl lock and which thus causes a deadlock. Further, if iw_cxgb3 is
loaded _after_ the nic interface is brought up, then the deadlock does
not occur and therefore fw_supports_fastreg() does need to grab the
rtnl lock in that path.
It turns out this code is all useless anyway. The low level driver
will NOT allow the open if the firmware isn't 7.0, so iw_cxgb3 can
always set the MEM_MGT_EXTENSIONS bit. Simplify...
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 94567ef16bf38e98a7de214694d327feb3ec42d4
Author: Robin Holt <holt at sgi.com>
Date: Mon Aug 4 11:06:16 2008 -0700
[IA64] Cleanup generated file not ignored by .gitignore
arch/ia64/kernel/vmlinux.lds is a generated file. Tell
git to ignore it.
Signed-off-by: Robin Holt <holt at sgi.com>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit 1c355a6e80fd08e623416138631e240f431385f2
Author: Steve Wise <swise at opengridcomputing.com>
Date: Mon Aug 4 11:05:43 2008 -0700
RDMA/cxgb3: Fix up MW access rights
- MWs don't have local read/write permissions.
- Set the MW_BIND enabled bit if a MR has MW_BIND access.
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 5f0f66b022ba607db0a083bf5cc13e4a4336e366
Author: Steve Wise <swise at opengridcomputing.com>
Date: Mon Aug 4 11:04:42 2008 -0700
RDMA/cxgb3: Fix QP capabilities
- Set the stag0 and fastreg capability bits only for kernel qps.
- QP_PRIV flag is no longer used, so don't set it.
Signed-off-by: Steve Wise <swise at opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 3f44675439b136d51179d31eb5a498383cb38624
Author: Roland Dreier <rolandd at cisco.com>
Date: Mon Aug 4 11:02:14 2008 -0700
RDMA/cma: Remove padding arrays by using struct sockaddr_storage
There are a few places where the RDMA CM code handles IPv6 by doing
struct sockaddr addr;
u8 pad[sizeof(struct sockaddr_in6) -
sizeof(struct sockaddr)];
This is fragile and ugly; handle this in a better way with just
struct sockaddr_storage addr;
[ Also roll in patch from Aleksey Senin <alekseys at voltaire.com> to
switch to struct sockaddr_storage and get rid of padding arrays in
struct rdma_addr. ]
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 9b3cbf725fb98733976fd02e2e557f0ae3028df0
Author: Isaku Yamahata <yamahata at valinux.co.jp>
Date: Mon Aug 4 12:02:28 2008 +0900
[IA64] pv_ops: fix ivt.S paravirtualization
Recent kernels are not booting on some HP systems (though
it does boot on others). James and Willy reported the
problem. James did the bisection to find the commit
that caused the problem:
498c5170472ff0c03a29d22dbd33225a0be038f4.
[IA64] pvops: paravirtualize ivt.S
Two instructions were wrongly paravirtualized such that
_FROM_ macro had been used where _TO_ was intended
Cc: James Bottomley <James.Bottomley at HansenPartnership.com>
Cc: "Wilcox, Matthew R" <matthew.r.wilcox at intel.com>
Signed-off-by: Isaku Yamahata <yamahata at valinux.co.jp>
Signed-off-by: Tony Luck <tony.luck at intel.com>
commit bf9c8c9ddef7ef761ae9747349175adad0ef16ce
Author: Timur Tabi <timur at freescale.com>
Date: Fri Aug 1 14:58:44 2008 -0500
ALSA: ASoC: fix SNDCTL_DSP_SYNC support in Freescale 8610 sound drivers
If an OSS application calls SNDCTL_DSP_SYNC, then ALSA will call the driver's
_hw_params and _prepare functions again. On the Freescale MPC8610 DMA ASoC
driver, this caused the DMA controller to be unneccessarily re-programmed, and
apparently it doesn't like that. The DMA will then not operate when
instructed. This patch relocates much of the DMA programming to
fsl_dma_open(), which is called only once.
Signed-off-by: Timur Tabi <timur at freescale.com>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
commit 1a61c88defcd611bd148d6c960b498e1b8bbbe00
Author: zhangxiliang <zhangxiliang at cn.fujitsu.com>
Date: Sat Aug 2 10:56:37 2008 +0800
Re: [PATCH] Fix the kernel panic of audit_filter_task when key field is set
Sorry, I miss a blank between if and "(".
And I add "unlikely" to check "ctx" in audit_match_perm() and audit_match_filetype().
This is a new patch for it.
Signed-off-by: Zhang Xiliang <zhangxiliang at cn.fujitsu.com>
Signed-off-by: Al Viro <viro at zeniv.linux.org.uk>
commit f5663f5bded3364158e2d31904173cb1debc2ecd
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 16:52:34 2008 +0900
sh: enable maple_keyb in dreamcast_defconfig.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit cce2d453e4940d3fccd42a6917d01027148e11c3
Author: Yoshinori Sato <ysato at users.sourceforge.jp>
Date: Mon Aug 4 16:33:47 2008 +0900
SH2(A) cache update
Includes:
- SH2 (7619) Writeback support.
- SH2A cache handling fix.
Signed-off-by: Yoshinori Sato <ysato at users.sourceforge.jp>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 1af446edfe3239b2b731f3458b3c285c397464cc
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 16:01:47 2008 +0900
nommu: Provide vmalloc_exec().
Now that SH has switched to vmalloc_exec() for PAGE_KERNEL_EXEC usage,
it's apparent that nommu has no vmalloc_exec() definition of its own.
Stub in the one from mm/vmalloc.c.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit d8eb2fab18b856fcaebe2619e8eaaa152baebc66
Author: Takashi Yoshii <yoshii.takashi at renesas.com>
Date: Mon Aug 4 14:28:38 2008 +0900
add addrespace definition for sh2a.
Newfile: arch/sh/include/cpu-sh2a/cpu/addrspace.h
This file seems had be removed to use fallback (cpu-common/cpu/addrspace.h),
but, I'd like to add sh2a specific file here, because
1. the values defined there are not suitable for sh2a.
2. I don't think there is "common" definition for these values.
Values are chosen by consideration of followings...
P1 is 0. perhaps no question.
P2 is from hardware manual, which says no-cache area starts at 20000000.
It means that P? space size=20000000.
P3 is P2+size since asm/ptrace.h uses P3 as a end of P2.
P4 is P3+size since asm/fixup.h uses P4 as a end of P3.
Signed-off-by: Takashi YOSHII <yoshii.takashi at renesas.com>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 42ced5561a3f49ba0ef09e94ccc016841fc94aa7
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 14:18:53 2008 +0900
sh: Kill off ARCH_SUPPORTS_AOUT and remnants of a.out support.
SH never really supported a.out, so this was all just copied over blindly
from x86 way back when. As we don't reference linux/a.out.h anywhere in
the tree, these can now safely be killed off.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 5093c9a4e41518425d42c0bb5bb92f514ec77b1d
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 14:17:13 2008 +0900
sh: define GENERIC_HARDIRQS_NO__DO_IRQ.
We haven't called in to __do_IRQ() in a long time, so it seems like a
reasonable time to switch this on by default.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit bdcab87b1c54f61dbc0a77648fee4c2b17964d5c
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 14:09:15 2008 +0900
sh: define GENERIC_LOCKBREAK.
Needed for fixing up the __raw_spin_is_contended() reference which
results in a build error.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit c3b4adfa65bae300a143188491e285556ca80fff
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 13:42:49 2008 +0900
sh: Save NUMA node data in vmcore for crash dumps.
Presently the NUMA node data isn't saved on kexec. This implements a
simple arch_crash_save_vmcoreinfo() for saving off the relevant data.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 4b59c97325371d51275bdb50523fa98a301615b0
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 13:34:29 2008 +0900
sh: module_alloc() should be using vmalloc_exec().
SH-X2 extended mode TLB allows for toggling of the exec bit, so make
sure we are using the right protection bits for module space there
also.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 3108cf061228c2c2951006c80fb6fe832000adda
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 13:32:04 2008 +0900
sh: Fix up __bug_table handling in module loader.
We should be calling in to the lib/bug.c module helpers, fix that up.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 6e583ce5242f32e925dcb198f7123256d0798370
Author: Stephen Hemminger <shemminger at vyatta.com>
Date: Sun Aug 3 21:29:57 2008 -0700
net: eliminate refcounting in backlog queue
Avoid the overhead of atomic increment/decrement on each received packet.
This helps performance of non-NAPI devices (like loopback).
Use cleanup function to walk queue on each cpu and clean out any
left over packets.
Signed-off-by: Stephen Hemminger <shemminger at vyatta.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 283d07ac201ee9f8aa6dc6f7519436b48760baff
Author: Wei Yongjun <yjwei at cn.fujitsu.com>
Date: Sun Aug 3 21:15:59 2008 -0700
ipv6: Do not drop packet if skb->local_df is set to true
The old code will drop IPv6 packet if ipfragok is not set, since
ipfragok is obsoleted, will be instead by used skb->local_df, so this
check must be changed to skb->local_df.
This patch fix this problem and not drop packet if skb->local_df is
set to true.
Signed-off-by: Wei Yongjun <yjwei at cn.fujitsu.com>
Acked-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f880374c2fe37aad3fa62253a4bc125d7a933aad
Author: Herbert Xu <herbert at gondor.apana.org.au>
Date: Sun Aug 3 21:15:08 2008 -0700
sctp: Drop ipfargok in sctp_xmit function
The ipfragok flag controls whether the packet may be fragmented
either on the local host on beyond. The latter is only valid on
IPv4.
In fact, we never want to do the latter even on IPv4 when PMTU is
enabled. This is because even though we can't fragment packets
within SCTP due to the prtocol's inherent faults, we can still
fragment it at IP layer. By setting the DF bit we will improve
the PMTU process.
RFC 2960 only says that we SHOULD clear the DF bit in this case,
so we're compliant even if we set the DF bit. In fact RFC 4960
no longer has this statement.
Once we make this change, we only need to control the local
fragmentation. There is already a bit in the skb which controls
that, local_df. So this patch sets that instead of using the
ipfragok argument.
The only complication is that there isn't a struct sock object
per transport, so for IPv4 we have to resort to changing the
pmtudisc field for every packet. This should be safe though
as the protocol is single-threaded.
Note that after this patch we can remove ipfragok from the rest
of the stack too.
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit b5ed042249cb5f76a428aa40ca219d591dad9eea
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 12:53:55 2008 +0900
sh: Add documentation and integrate into docbook build.
This adds some preliminary docbook bits for SH, tying in to the few
interfaces that are exposed and that have adequate kerneldoc comments.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 6a9545bd95e88d61df942b9087cb59b8c7a6dc56
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 12:51:06 2008 +0900
sh: Fix up broken kerneldoc comments.
These were completely unparseable, so fix them up.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 9c4cb82515130c62224e23fdf7c13c8f6c59c614
Author: Kumar Gala <galak at kernel.crashing.org>
Date: Sat Aug 2 02:44:11 2008 +1000
powerpc: Remove use of CONFIG_PPC_MERGE
Now that arch/ppc is gone and CONFIG_PPC_MERGE is always set, remove
the dead code associated with !CONFIG_PPC_MERGE from arch/powerpc
and include/asm-powerpc.
Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit c7c8eede2739289df02a1ab297cc476c6f38dca7
Author: Tony Breeds <tony at bakeyournoodle.com>
Date: Fri Aug 1 11:38:39 2008 +1000
powerpc: Force printing of 'total_memory' to unsigned long long
total_memory is a 'phys_addr_t', Which can be either 64 or 32 bits.
Force printing as unsigned long long to silence the warning.
Signed-off-by: Tony Breeds <tony at bakeyournoodle.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit fb61063587982b52304d62cdbb6a0a88d26ae7ef
Author: Tony Breeds <tony at bakeyournoodle.com>
Date: Thu Jul 31 13:51:42 2008 +1000
powerpc: Fix compiler warning in arch/powerpc/mm/mem.c
Explicitly cast to unsigned long long, rather than u64.
Signed-off-by: Tony Breeds <tony at bakeyournoodle.com>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 93d0ec851820688ef5b21a84e7460d3cf405f5c5
Author: Jeff Layton <jlayton at redhat.com>
Date: Sat Aug 2 08:00:48 2008 -0400
remove locking around tcpSesAllocCount atomic variable
The global tcpSesAllocCount variable is an atomic already and doesn't
really need the extra locking around it. Remove the locking and just use
the atomic_inc_return and atomic_dec_return functions to make sure we
access it correctly.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit b8b572e1015f81b4e748417be2629dfe51ab99f9
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Fri Aug 1 15:20:30 2008 +1000
powerpc: Move include files to arch/powerpc/include/asm
from include/asm-powerpc. This is the result of a
mkdir arch/powerpc/include/asm
git mv include/asm-powerpc/* arch/powerpc/include/asm
Followed by a few documentation/comment fixups and a couple of places
where <asm-powepc/...> was being used explicitly. Of the latter only
one was outside the arch code and it is a driver only built for powerpc.
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus at samba.org>
commit 617870632de6739fca0893f3e6648e9ae1bd0ddb
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 10:58:24 2008 +0900
maple: Kill useless private_data pointer.
We can simply wrap in to the dev_set/get_drvdata(), there's no reason
to track an extra level of private data on top of the struct device.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 63870295de9adb365cd121dab94379b8cfdf986a
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 10:39:46 2008 +0900
maple: Clean up maple_driver_register/unregister routines.
These were completely inconsistent. Clean these up to take a maple_driver
pointer directly for consistency.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit cfb266c0ee0ea0b7bfa8189e3a3a80344dec6112
Author: Yang Hongyang <yanghy at cn.fujitsu.com>
Date: Sun Aug 3 18:16:15 2008 -0700
ipv6: Fix the return value of Set Hop-by-Hop options header with NULL data pointer
When Set Hop-by-Hop options header with NULL data
pointer and optlen is not zero use setsockopt(),
the kernel successfully return 0 instead of
return error EINVAL or EFAULT.
This patch fix the problem.
Signed-off-by: Yang Hongyang <yanghy at cn.fujitsu.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 1730554f253deb65fe5112c54b2f898d5318a328
Author: Florian Westphal <fw at strlen.de>
Date: Sun Aug 3 18:13:44 2008 -0700
ipv6: syncookies: free reqsk on xfrm_lookup error
cookie_v6_check() did not call reqsk_free() if xfrm_lookup() fails,
leaking the request sock.
Signed-off-by: Florian Westphal <fw at strlen.de>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 459021fe3627083ea6678a7b29f9f74accf9c6fd
Author: Adrian McMenamin <adrian at mcmen.demon.co.uk>
Date: Mon Aug 4 10:09:03 2008 +0900
input: Clean up maple keyboard driver
Have a single probe function instead of a probe and a connect function.
Also tidy a comment.
Signed-off-by: Adrian McMenamin <adrian at mcmen.demon.co.uk>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 86d9d32c7b17f8145dc8cbc9667e6385bf8ebc67
Author: Adrian McMenamin <adrian at newgolddream.dyndns.info>
Date: Wed Jul 30 12:31:38 2008 -0700
maple: allow removal and reinsertion of keyboard driver module
Allow the removal (and subsequent reinsertion) of the maple_keyb (maple
keyboard) driver by adding a working removal function.
Also tidy long lines.
Signed-off-by: Adrian McMenamin <adrian at mcmen.demon.co.uk>
Cc: Dmitry Torokhov <dtor at mail.ru>
Cc: Paul Mundt <lethal at linux-sh.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit c07abb6dbec754511427dd847f10cfdec6d36b3c
Author: Paul Mundt <lethal at linux-sh.org>
Date: Mon Aug 4 08:11:03 2008 +0900
sh: /proc/asids depends on MMU.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit adf044c8778de98dae29c5ce9973b7e43964674f
Author: Sven Wegener <sven.wegener at stealer.net>
Date: Sun Aug 3 14:06:44 2008 -0700
net: Add missing extra2 parameter for ip_default_ttl sysctl
Commit 76e6ebfb40a2455c18234dcb0f9df37533215461 ("netns: add namespace
parameter to rt_cache_flush") acceses the extra2 parameter of the
ip_default_ttl ctl_table, but it is never set to a meaningful
value. When e84f84f276473dcc673f360e8ff3203148bdf0e2 ("netns: place
rt_genid into struct net") is applied, we'll oops in
rt_cache_invalidate(). Set extra2 to init_net, to avoid that.
Reported-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Signed-off-by: Sven Wegener <sven.wegener at stealer.net>
Tested-by: Marcin Slusarz <marcin.slusarz at gmail.com>
Acked-by: Denis V. Lunev <den at openvz.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 8f616cd5249e03c9e1b371623d85e76d4b86bbc1
Merge: 7e31aa11fc672bbe0dd0da59513c9efe3809ced7 7d55992d60caa390460bad1a974eb2b3c11538f4
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Aug 3 10:50:44 2008 -0700
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: remove write-only variables from ext4_ordered_write_end
ext4: unexport jbd2_journal_update_superblock
ext4: Cleanup whitespace and other miscellaneous style issues
ext4: improve ext4_fill_flex_info() a bit
ext4: Cleanup the block reservation code path
ext4: don't assume extents can't cross block groups when truncating
ext4: Fix lack of credits BUG() when deleting a badly fragmented inode
ext4: Fix ext4_ext_journal_restart()
ext4: fix ext4_da_write_begin error path
jbd2: don't abort if flushing file data failed
ext4: don't read inode block if the buffer has a write error
ext4: Don't allow lg prealloc list to be grow large.
ext4: Convert the usage of NR_CPUS to nr_cpu_ids.
ext4: Improve error handling in mballoc
ext4: lock block groups when initializing
ext4: sync up block and inode bitmap reading functions
ext4: Allow read/only mounts with corrupted block group checksums
ext4: Fix data corruption when writing to prealloc area
commit 7e31aa11fc672bbe0dd0da59513c9efe3809ced7
Merge: 071f4924844c435a3ae0cdbab7d7df2f1da85713 9cb7117fa4858468014f76bd996076985111e955
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sun Aug 3 10:39:02 2008 -0700
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 5182/1: pxa: Fix pcm990 compilation
[ARM] Fix explicit asm(-arm)?/arch-foo references
[ARM] move include/asm-arm to arch/arm/include/asm
[ARM] Remove explicit dependency for misc.o from compressed/Makefile
[ARM] initrd: claim initrd memory exclusively
[ARM] pxa: add support for L2 outer cache on XScale3 (attempt 2)
[ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout
[ARM] add Sascha Hauer as Freescale i.MX Maintainer
[ARM] i.MX: add missing clock functions exports
[ARM] i.MX: remove set_imx_fb_info() export
[ARM] mx1ads: make mmc platform data available for modules
[ARM] mx2: add missing Kconfig dependency
commit c48e64ae574a1e30a23174701560a222a192e4c3
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date: Sun Aug 3 22:18:51 2008 +0800
arch/sh/boards/mach-se/7343/irq.c: removed duplicated #include
Removed duplicated include <linux/irq.h> in
arch/sh/boards/mach-se/7343/irq.c.
Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 8edd744202e83ac2fce13f4898a90b403cc22141
Author: Huang Weiyi <weiyi.huang at gmail.com>
Date: Sun Aug 3 22:18:48 2008 +0800
arch/sh/boards/board-ap325rxa.c: removed duplicated #include
Removed duplicated include <linux/delay.h> in
arch/sh/boards/board-ap325rxa.c.
Signed-off-by: Huang Weiyi <weiyi.huang at gmail.com>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 9cb7117fa4858468014f76bd996076985111e955
Author: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Date: Sun Aug 3 00:02:35 2008 +0100
[ARM] 5182/1: pxa: Fix pcm990 compilation
Compiling pcm990 produces an error:
In file included from arch/arm/mach-pxa/pcm990-baseboard.c:25:
include/linux/ide.h:645: error: 'CONFIG_IDE_MAX_HWIFS' undeclared here (not in a function)
Fix it by removing unneeded header include.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski at gmx.de>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit cf368d2f9aced8adc8bd6b1f04294a71551d5fce
Author: Alexander Beregalov <a.beregalov at gmail.com>
Date: Sun Aug 3 03:03:57 2008 +0400
drivers/video/console/promcon.c: fix build error
drivers/video/console/promcon.c:158: error: implicit declaration of
function 'con_protect_unimap'
Introduced by commit a29ccf6f823a84d89e1c7aaaf221cf7282022024
("embedded: fix vc_translate operator precedence").
Signed-off-by: Alexander Beregalov <a.beregalov at gmail.com>
Cc: Tim Bird <tim.bird at am.sony.com>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit e5a4a72d4f88f4389e9340d383ca67031d1b8536
Author: Lennert Buytenhek <buytenh at marvell.com>
Date: Sun Aug 3 01:23:10 2008 -0700
net: use software GSO for SG+CSUM capable netdevices
If a netdevice does not support hardware GSO, allowing the stack to
use GSO anyway and then splitting the GSO skb into MSS-sized pieces
as it is handed to the netdevice for transmitting is likely still
a win as far as throughput and/or CPU usage are concerned, since it
reduces the number of trips through the output path.
This patch enables the use of GSO on any netdevice that supports SG.
If a GSO skb is then sent to a netdevice that supports SG but does not
support hardware GSO, net/core/dev.c:dev_hard_start_xmit() will take
care of doing the necessary GSO segmentation in software.
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Signed-off-by: Herbert Xu <herbert at gondor.apana.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 745e203164a9057e0de769ff4649e6e455daf753
Author: Chris Larson <clarson at mvista.com>
Date: Sun Aug 3 01:10:55 2008 -0700
net: fix missing pneigh entries in the neighbor seq_file code
When pneigh entries exist, but the user's read buffer isn't sufficient to
hold them all, one of the pneigh entries will be missing from the results.
In neigh_get_idx_any, the number of elements which neigh_get_idx
encountered is not correctly subtracted from the position number before
the call to pneigh_get_idx. neigh_get_idx reduces the position by 1 for
each call to neigh_get_next, but it does not reduce it by one for the
first element (neigh_get_first). The patch alters the neigh_get_idx and
pneigh_get_idx functions to subtract one from pos, for the first element,
when pos is non-zero.
Signed-off-by: Chris Larson <clarson at mvista.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit bff69732c9947f821a64a8477f7dcaa9c30e6a69
Author: Chris Larson <clarson at mvista.com>
Date: Sun Aug 3 01:02:41 2008 -0700
net: in the first call to neigh_seq_next, call neigh_get_first, not neigh_get_idx.
neigh_seq_next won't be called both with *pos > 0 && v ==
SEQ_START_TOKEN, so there's no point calling neigh_get_idx when we're
on the start token, just call neigh_get_first directly.
Signed-off-by: Chris Larson <clarson at mvista.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 7e43f1128d4c4bd91786ca6abff45a91e88f9776
Author: David S. Miller <davem at davemloft.net>
Date: Sat Aug 2 23:27:37 2008 -0700
pkt_sched: Make sure RTNL is held in qdisc_root_lock().
It is the only legal environment in which this can be
used.
Add some commentary explaining the situation.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 35ed4e75989c4e84a44b25569bbf09b98f923880
Author: David S. Miller <davem at davemloft.net>
Date: Sat Aug 2 23:25:50 2008 -0700
mac80211: Use queue_lock() in ieee80211_ht_agg_queue_remove().
qdisc_root_lock() is only %100 safe to use when the RTNL
semaphore is held.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5fb662297b8a4bdadd60371c34b760efca948ebc
Author: David S. Miller <davem at davemloft.net>
Date: Sat Aug 2 20:02:43 2008 -0700
pkt_sched: Use qdisc_lock() on already sampled root qdisc.
Based upon a bug report by Jeff Kirsher.
Don't use qdisc_root_lock() in these cases as the root
qdisc could have been changed, and we'd thus lock the
wrong object.
Tested by Emil S Tantilov who confirms that this seems
to fix the problem.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 7d55992d60caa390460bad1a974eb2b3c11538f4
Author: Eric Sandeen <sandeen at redhat.com>
Date: Sat Aug 2 21:22:18 2008 -0400
ext4: remove write-only variables from ext4_ordered_write_end
The variables 'from' and 'to' are not used anywhere.
Signed-off-by: Eric Sandeen <sandeen at redhat.com>
Acked-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 596400f0f322c78347e35c197b66faf09a9c1e02
Author: Adrian Bunk <bunk at kernel.org>
Date: Sat Aug 2 19:53:44 2008 +0300
sh/boards/Makefile typo fix
The following build error was caused by an obvious typo:
<-- snip -->
...
LD arch/sh/mm/built-in.o
make[2]: *** No rule to make target `arch/sh/boards/board-shmin..o', needed by `arch/sh/boards/built-in.o'. Stop.
<-- snip -->
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit bccf650270a94cec6e9238743e84c6e01de30c70
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sat Aug 2 22:33:18 2008 +0100
[ARM] Fix explicit asm(-arm)?/arch-foo references
No file should be explicitly referencing its own platform headers
by specifying an absolute include path. Fix these paths to use
standard <asm/arch/...> includes.
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 4baa9922430662431231ac637adedddbb0cfb2d7
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sat Aug 2 10:55:55 2008 +0100
[ARM] move include/asm-arm to arch/arm/include/asm
Move platform independent header files to arch/arm/include/asm, leaving
those in asm/arch* and asm/plat* alone.
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 8401d92ba46a1e859464cbd9c9ee304f6e361da3
Author: David Moore <dcm at acm.org>
Date: Tue Jul 29 23:46:25 2008 -0700
firewire: Preserve response data alignment bug when it is harmless
Recently, a bug having to do with the alignment of transaction response
data was fixed. However, some apps such as libdc1394 relied on the
presence of that bug in order to function correctly. In order to stay
compatible with old versions of those apps, this patch preserves the bug
in cases where it is harmless to normal operation (such as the single
quadlet read) due to a simple duplication of data. This guarantees
maximum compatability for those users who are using the old app with the
fixed kernel.
Signed-off-by: David Moore <dcm at acm.org>
Signed-off-by: Stefan Richter <stefanr at s5r6.in-berlin.de>
commit 85ebd00334099fd5d296bcae74a66c943d46686d
Author: Marc Zyngier <maz at misterjones.org>
Date: Sat Aug 2 19:12:23 2008 +0200
Fix IHEX firmware generation/loading
Fix both the IHEX firmware generation (len field always null, and EOF
marker a byte too short) and loading (struct ihex_binrec needs to be
packed to reflect the on-disk structure).
Signed-off-by: Marc Zyngier <maz at misterjones.org>
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 071f4924844c435a3ae0cdbab7d7df2f1da85713
Merge: d9c566198bfdf72a041322a093fdc1a2dc231170 f1136d022af8f07a97f59c6d07483bdb82ffbd8e
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Aug 2 09:14:49 2008 -0700
Merge git://git.infradead.org/users/dwmw2/random-2.6
* git://git.infradead.org/users/dwmw2/random-2.6:
[MTD] Fix !CONFIG_BLOCK compile for mtdsuper.c
firmware: silence __fw_modbuild and __fw_modinst 'Nothing to be done' messages
commit d9c566198bfdf72a041322a093fdc1a2dc231170
Merge: 17263849c7ad2279667dd298083eceefcd1b5845 0a4949c4414af2eb91414bcd8e2a8ac3706f7dde
Author: Linus Torvalds <torvalds at linux-foundation.org>
Date: Sat Aug 2 09:14:23 2008 -0700
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Do not clobber %g7 in setcontext() trap.
sparc64: Kill __show_regs().
sparc: Add __KERNEL__ ifdef protection to pt_regs helpers.
sparc64: Kill smp_report_regs().
sparc64: Kill VERBOSE_SHOWREGS code.
sparc64: Hook up trigger_all_cpu_backtrace().
sparc64: Make global reg dumping even more useful.
sparc: Ignore drivers/video/console/promcon_tbl.c conmakehash generated file
sparc64: FUTEX_OP_ANDN fix
sparc: merge of_platform_{32,64}.h
sparc64: Kill isa_bus_type.
sparc64: Fix global reg snapshotting on self-cpu.
commit 17263849c7ad2279667dd298083eceefcd1b5845
Author: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Date: Sat Aug 2 13:59:37 2008 +0900
fat: Fix allow_utime option
FAT has to handle the newly introduced ATTR_TIMES_SET for allow_utime
option.
Signed-off-by: OGAWA Hirofumi <hirofumi at mail.parknet.co.jp>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 84209e02de48d72289650cc5a7ae8dd18223620f
Author: Miklos Szeredi <mszeredi at suse.cz>
Date: Fri Aug 1 20:28:47 2008 +0200
mm: dont clear PG_uptodate on truncate/invalidate
Brian Wang reported that a FUSE filesystem exported through NFS could
return I/O errors on read. This was traced to splice_direct_to_actor()
returning a short or zero count when racing with page invalidation.
However this is not FUSE or NFSD specific, other filesystems (notably
NFS) also call invalidate_inode_pages2() to purge stale data from the
cache.
If this happens while such pages are sitting in a pipe buffer, then
splice(2) from the pipe can return zero, and read(2) from the pipe can
return ENODATA.
The zero return is especially bad, since it implies end-of-file or
disconnected pipe/socket, and is documented as such for splice. But
returning an error for read() is also nasty, when in fact there was no
error (data becoming stale is not an error).
The same problems can be triggered by "hole punching" with
madvise(MADV_REMOVE).
Fix this by not clearing the PG_uptodate flag on truncation and
invalidation.
Signed-off-by: Miklos Szeredi <mszeredi at suse.cz>
Acked-by: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Andrew Morton <akpm at linux-foundation.org>
Cc: Jens Axboe <jens.axboe at oracle.com>
Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
commit 31981db0d0b665713ab3e9531f936fdb67947225
Author: Karsten Keil <kkeil at suse.de>
Date: Sat Aug 2 16:40:37 2008 +0200
Add DIP switch readout for HFC-4S IOB4ST
Also the HFC-4S IOB4ST has DIP switches and jumpers to configure
the port.
Signed-off-by: Karsten Keil <kkeil at suse.de>
commit b3e0aeeb7e0f89791c4c3bdfd98b36074c5178e6
Author: Karsten Keil <kkeil at suse.de>
Date: Sat Aug 2 16:35:53 2008 +0200
Fix remaining big endian issue of hfcmulti
The driver was not so bad at big endian at all, only the optimised fifo
read/write functions need a fix, with this fix the driver works on
a pegasus PPC machine.
Signed-off-by: Karsten Keil <kkeil at suse.de>
commit ff4cc1de2401ad44ae084c3f5a9e898af0879520
Author: Karsten Keil <kkeil at suse.de>
Date: Wed Jul 30 18:26:58 2008 +0200
mISDN cleanup user interface
The channelmap should have the same size on 32 and 64 bit systems
and should not depend on endianess.
Thanks to David Woodhouse for spotting this.
Signed-off-by: Karsten Keil <kkeil at suse.de>
commit 780aefed1e179b23dcfbd6cfcb627ec3bd0a164c
Author: Karsten Keil <kkeil at suse.de>
Date: Tue Jul 29 18:47:22 2008 +0200
mISDN fix main ISDN Makefile
Compile hardware directory independent from selecting
CAPI support.
Signed-off-by: Karsten Keil <kkeil at suse.de>
commit ff4db0a043a5dee7180bdffd178e61cd02812c68
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Sat Aug 2 15:21:31 2008 +0100
[ARM] Remove explicit dependency for misc.o from compressed/Makefile
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 82f97b8d3cb3982ec97e081598c671fab2c321b0
Author: Ivo van Doorn <IvDoorn at gmail.com>
Date: Sat Aug 2 01:31:09 2008 -0700
rt2x00: Fix compile warning
rt2x00usb_vendor_request_large_buff is write-only, so it is
safe to make the argument a const.
Fixes compile warning:
drivers/net/wireless/rt2x00/rt73usb.c: In function 'rt73usb_load_firmware':
drivers/net/wireless/rt2x00/rt73usb.c:916: warning: passing argument 5 of 'rt2x00usb_vendor_request_large_buff' discards qualifiers from pointer target typ
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit f1136d022af8f07a97f59c6d07483bdb82ffbd8e
Author: David Woodhouse <David.Woodhouse at intel.com>
Date: Sat Aug 2 00:01:21 2008 +0100
[MTD] Fix !CONFIG_BLOCK compile for mtdsuper.c
As reported by Adrian Bunk, commit d5686b444ff3f72808d2b3fbd58672a86cdf38e7
(switch mtd and dm-table to lookup_bdev()) causes the following compile
error with CONFIG_BLOCK=n:
CC drivers/mtd/mtdsuper.o
drivers/mtd/mtdsuper.c: In function `get_sb_mtd':
drivers/mtd/mtdsuper.c:184: error: implicit declaration of function 'lookup_bdev'
drivers/mtd/mtdsuper.c:184: warning: assignment makes pointer from integer without a cast
drivers/mtd/mtdsuper.c:197: error: implicit declaration of function 'bdput'
make[3]: *** [drivers/mtd/mtdsuper.o] Error 1
Fix it by putting the block device lookup inside #ifdef CONFIG_BLOCK
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit 759da9267177e5005c8f21e11d29d26f4f459744
Author: David Woodhouse <David.Woodhouse at intel.com>
Date: Fri Aug 1 23:58:36 2008 +0100
firmware: silence __fw_modbuild and __fw_modinst 'Nothing to be done' messages
People don't like them and think they're errors.
Leave the __fw_install one though; when 'make firmware_install' does
nothing, it's best to have a 'Nothing to be done for...' message rather
than just doing nothing.
Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
commit e9e80ea5f2129e135e3a6fa260314b1c6d99b19a
Merge: 2b12a4c524812fb3f6ee590a02e65b95c8c32229 56decd3c5758b0d776c073f65f777beb7a05ac0a
Author: David S. Miller <davem at davemloft.net>
Date: Fri Aug 1 22:08:51 2008 -0700
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
commit 49de935c107a53b0eba336efceb1dc3a8be64f87
Author: Adrian Bunk <bunk at kernel.org>
Date: Sat Aug 2 01:13:44 2008 +0300
sh: fix LIBGCC
Commit f15cbe6f1a4b4d9df59142fc8e4abb973302cf44
(sh: migrate to arch/sh/include/) moved KBUILD_CFLAGS
(which is used by LIBGCC) below LIBGCC, causing build
errors like the following:
<-- snip -->
...
LD .tmp_vmlinux1
arch/sh/kernel/built-in.o: In function `module_clk_recalc':
clock-sh4.c:(.text+0x80f0): undefined reference to `__udivsi3_i4i'
...
make[1]: *** [.tmp_vmlinux1] Error 1
<-- snip -->
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 4385e12b291a6816987cb88a74fc116f520180f8
Author: Paul Mundt <lethal at linux-sh.org>
Date: Sat Aug 2 07:14:09 2008 +0900
sh: Revert the location change of auto-generated asm/machtypes.h
This ended up causing build breakage on O= builds, as reported by Adrian:
<-- snip -->
...
CC init/main.o
In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/irq.h:4,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/irq.h:23,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/hardirq.h:5,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/hardirq.h:7,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/asm-generic/local.h:5,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/local.h:4,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/module.h:19,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/init/main.c:13:
/home/bunk/linux/kernel-2.6/git/linux-2.6/arch/sh/include/asm/machvec.h:15:27:
error: asm/machtypes.h: No such file or directory
make[2]: *** [init/main.o] Error 1
<-- snip -->
So we simply move machtypes.h back to its original place. asm-offsets.h is
still generated there regardless, until such a time that we find a better place
to stash auto-generated files.
Reported-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 26a8ef5326e390d89290822fb1f4fcf16845fd84
Author: Paul Mundt <lethal at linux-sh.org>
Date: Thu Jul 31 16:24:19 2008 +0900
net: stnic: Fix up fallout from SH header migration.
asm/se.h moved to mach-se/mach/se.h, update the path. We could use
mach/se.h here also, but it's preferable to be explicit when there's
only a single supported mach-type.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 9e5e21170e4de269cd5b9d53ac9d60d220e3be63
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Jul 30 20:05:35 2008 +0900
sh: Fix up the audit arch endian specification.
Presently this was always being set to AUDIT_ARCH_SH, which assumes
big endian. Fix this up so that the architecture actually reflects
what we're running on.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit ab99c733ae73cce31f2a2434f7099564e5a73d95
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Jul 30 19:55:30 2008 +0900
sh: Make syscall tracer use tracehook notifiers, add TIF_NOTIFY_RESUME.
This follows the changes in commits:
7d6d637dac2050f30a1b57b0a3dc5de4a10616ba
4f72c4279eab1e5f3ed1ac4e55d4527617582392
on powerpc. Adding in TIF_NOTIFY_RESUME, and cleaning up the syscall
tracing to be more generic. This is an incremental step to turning
on tracehook, as well as unifying more of the ptrace and signal code
across the 32/64 split.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit c459dbf294b4a3d70490a468a7ca3907fb2c2f57
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Jul 30 19:09:31 2008 +0900
sh: ptrace single stepping cleanups.
This converts the single stepping done by sh/sh64 ptrace implementations
to use the generic user_enable/disable_single_step(), and subsequently
rips out a lot of ptrace request cases that are now handled generically.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit c4637d475170ca0d99973efd07df727012db6cd1
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Jul 30 15:30:52 2008 +0900
sh: seccomp support.
This hooks up the seccomp thread flag and associated callback from the
syscall tracer.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit cec3fd3e2a7cacf37e2bd6d9fa915337245cc563
Author: Paul Mundt <lethal at linux-sh.org>
Date: Wed Jul 30 13:11:26 2008 +0900
sh: Tidy up the _TIF work masks, and fix syscall trace bug on singlestep.
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit daf423db3b6afd90ecdd776dbc32c0b57cc78edb
Author: Simon Horman <horms at verge.net.au>
Date: Wed Jul 30 10:29:39 2008 +1000
kdump: sh: parse elfcorehdr command line argument
A quick cut and paste from other architectures to allow SH
to parse the elfcorehdr command line argument which is required
for both is_kdump_kernel() and vmcore to function.
(the former is as yet unused on SH).
Tested compilation only
Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Paul Mundt <lethal at linux-sh.org>
commit 56decd3c5758b0d776c073f65f777beb7a05ac0a
Author: Maxim Levitsky <maximlevitsky at gmail.com>
Date: Fri Aug 1 12:54:27 2008 +0300
iwl3945: Fix statistics in monitor mode
iwl3945_rx_reply_rx was sending packets too early to
mac80211, before updating signal strength/quality.
This resulted in garbage power levels.
Signed-off-by: Maxim Levitsky <maximlevitsky at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 3d0f823953e6b5aa36fc098de2d27e15da220974
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Jul 31 19:03:10 2008 +0200
prism54 - Use offsetof()
Use the standard offsetof() macro to fix a compile warning below:
CC [M] drivers/net/wireless/prism54/isl_ioctl.o
drivers/net/wireless/prism54/isl_ioctl.c: In function 'prism2_ioctl_set_generic_element':
drivers/net/wireless/prism54/isl_ioctl.c:2658: warning: cast from pointer to integer of different size
Signed-off-by: Takashi Iwai <tiwai at suse.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit fb55d887c5bd9054ec069534e1ef9eb8d9a983c6
Author: Takashi Iwai <tiwai at suse.de>
Date: Thu Jul 31 19:02:06 2008 +0200
ipw2200 - Fix bad ipw_write8() macro
ipw_write8() can't be used alone with a loop because of a wrong definition.
CC [M] drivers/net/wireless/ipw2200.o
drivers/net/wireless/ipw2200.c: In function 'ipw_ethtool_set_eeprom':
drivers/net/wireless/ipw2200.c:10579: warning: array subscript is above array bounds
drivers/net/wireless/ipw2200.c: In function 'ipw_load':
drivers/net/wireless/ipw2200.c:2663: warning: array subscript is above array bounds
Add missing do {} while (0) to fix them.
Signed-off-by: Takashi Iwai <tiwai at suse.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 7dcdd073bf78bb6958bbc12a1a47754a0f3c4721
Author: Larry Finger <Larry.Finger at lwfinger.net>
Date: Thu Jul 31 19:30:48 2008 -0500
rtl8187: Fix lockups due to concurrent access to config routine
Some users of the RTL8187B have experienced difficulties since commit
49292d56352a6ab90d04c3448dd8b6106dfef2d6 that introduced the power
management wext hooks. This difficulty has not made much sense until
it was realized that it was possible for mac80211 to make a call to the
config routine while that routine was already being executed. On this
device, it is necessary to loopback the TX when changing channels. Unless
this is properly restored, the device will lockup. A mutex now protects
the device state, and the private data in several places.
The problem was found by Herton Ronaldo Krzesinski <herton at mandriva.com.br>,
who also suggested this type of fix.
Signed-off-by: Larry Finger <Larry.Finger at lwfinger.net>
Acked-by: Herton Ronaldo Krzesinski <herton at mandriva.com.br>
Acked-by: Hin-Tak Leung <htl10 at users.sourceforge.net>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit bf4634afd8bb72936d2d56425ec792ca1bfa92a2
Author: Peter Chubb <peterc at gelato.unsw.edu.au>
Date: Thu Jul 31 10:56:34 2008 +1000
rt2500pci: restoring missing line
In kernel version 2.6.26-rc9 my wireless LAN card worked; but in the
released 2.6.26, my RaLink rt2500 card wouldn't associate.
Git-bisect led me to this patch:
61486e0f68d1f8966c09b734566a187d42d65c54
rt2x00: Remove ieee80211_tx_control argument from write_tx_desc()
I believe that there is a problem with that patch --- it
(inadvertantly) removes an extra line of code, that used to set the
DATABYTE_COUNT field.
This patch reinstates that line, and with it my card works again.
Signed-off-by: Peter Chubb <peterc at gelato.unsw.edu.au>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 3b72b01d3ab623c296df49f2d71d40a38bcfb4b3
Author: Dan Williams <dcbw at redhat.com>
Date: Tue Jul 29 13:50:39 2008 -0400
libertas: only enable rtap with mesh firmware
Since only mesh-enabled firmware has the CMD_802_11_MONITOR_MODE on
which the rtap functionality depends, only expose the rtap functionality
when mesh is also available.
Signed-off-by: Dan Williams <dcbw at redhat.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit d4764b29b6e0f1608e397930677928e5a3f62bba
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Mon Jul 28 10:21:16 2008 +0200
rt2x00: Sequence counter should be protected in irqsave
The sequence counter can be accessed in IRQ context,
which means the lock protecting the counter should
be irqsave. To prevent making the entire intf->lock irqsave
without reason, create a new lock which only protects
the sequence counter.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 8d8acd46fb7e962ac04baef5a118d431fae6b0f6
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Mon Jul 28 10:20:12 2008 +0200
rt2x00: Fix VGC lower bound initialization
When the EEPROM_BBPTUNE_VGC word is valid, we should
override EEPROM_BBPTUNE_VGCLOWER field with the BBP
value.
And we should _not_ do that when EEPROM_BBPTUNE_R17 is valid.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit e6d3e902088ac5da77b074f513e3cb80422ff471
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jul 27 15:06:50 2008 +0200
rt2x00: rt61pci needs another millisecond after firmware upload
After the hardware has indicated the firmware upload has completed
and the device is ready, we should wait another millisecond to
make sure the device is really ready to continue.
Without this timout, bringing the interface down and up again will
fail due to incorrect register initialization.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit ada662f3eb6231ab27f5e6366d4e5c395d25edd3
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jul 27 15:06:21 2008 +0200
rt2x00: Fix partial antenna configuration
The if-statement to determine the new TX/RX antenna
configuration was incomplete. It lacks the general
else-clause when the antenna wasn't changed.
This is a correct event, since it can occur when only
one of the antenna's has been changed or when the new
configuration is being forced (like when the interface
has just been added).
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit d2b690714cd7d328561bfb9bf941edd6a3316a85
Author: Ivo van Doorn <ivdoorn at gmail.com>
Date: Sun Jul 27 15:06:05 2008 +0200
rt2x00: Fix access permissions on debugfs files
Although most rt2x00 debugfs files don't contain
information which could compromise network security,
it is better to set the access permissions to root only.
This will be required when HW crypto is implemented,
because it could be possible to read the HW key from
the registers.
Signed-off-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 7c7e6af37dad30632103497a72a1273d18ec55fe
Author: Andrea Merello <andrea.merello at gmail.com>
Date: Fri Jul 25 19:08:11 2008 +0200
Rtl8187 PATCH add usb ID for asus wireless link
This patch from Davide Cavalca adds a usb ID for an rtl8187L device.
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 143b09efb74efd3328f57d7a4bd6d7663c1d6497
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Thu Jul 24 21:33:42 2008 +0300
iwlwifi: don't stop queue in the middle of fragmented packet
This patch avoids stopping queue in the middle of the fragmented packet.
It is required that there will be ~10 (max packet/min fragment) or 16
(4 bits of frag number) free tfds all the time.
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 8de394f60235a825b32f30441290a44251eca45d
Author: Helmut Schaa <hschaa at suse.de>
Date: Thu Jul 24 18:22:55 2008 +0200
ath5k: remove obsolete declaration of struct ieee80211_hw_mode
Signed-off-by: Helmut Schaa <hschaa at suse.de>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit f8e79ddd31c3615ddca26b9a469c44a7adbd4e13
Author: Tomas Winkler <tomas.winkler at intel.com>
Date: Thu Jul 24 18:46:44 2008 +0300
mac80211: fix fragmentation kludge
This patch make mac80211 transmit correctly fragmented packet after
queue was stopped
Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit dc1968e7b7862bcd2d358c1be6119c011992bdd2
Author: Jiri Slaby <jirislaby at gmail.com>
Date: Wed Jul 23 13:17:34 2008 +0200
Ath5k: mask out unneeded interrupts
Mask out previously demanded interrupt flags because we set
new ones. Don't allow mixing them after switch from sta to
ibss and vice versa.
Signed-off-by: Jiri Slaby <jirislaby at gmail.com>
Cc: Nick Kossifidis <mickflemm at gmail.com>
Cc: Luis R. Rodriguez <mcgrof at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 96185664f10e79d038c084305d3cacff9b52204f
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Tue Jul 22 14:21:59 2008 +0400
RFKILL: set the status of the leds on activation.
Provide default activate function to set the state of the led
when the led becomes bound to the trigger
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Acked-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 7c4f4578fc85d42d149f86b47f76c28626a20d92
Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date: Tue Jul 22 14:17:37 2008 +0400
RFKILL: allow one to specify led trigger name
Allow the rfkill driver to specify led trigger name.
By default it still defaults to the name of rfkill switch.
Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>
Acked-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 6e28fbef0f330d7c1cade345eeae003d4e5d6070
Author: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Date: Thu Jul 31 10:53:57 2008 -0300
rfkill: query EV_SW states when rfkill-input (re)?connects to a input device
Every time a new input device that is capable of one of the
rfkill EV_SW events (currently only SW_RFKILL_ALL) is connected to
rfkill-input, we must check the states of the input EV_SW switches
and take action. Otherwise, we will ignore the initial switch state.
We also need to re-check the states of the EV_SW switches after
a device that was under an exclusive grab is released back to us,
since we got no input events from that device while it was grabbed.
Signed-off-by: Henrique de Moraes Holschuh <hmh at hmh.eng.br>
Acked-by: Ivo van Doorn <IvDoorn at gmail.com>
Cc: Dmitry Torokhov <dtor at mail.ru>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit f860ee26db51c478fd70039bd4902912a8d93993
Author: Nick Kossifidis <mick at madwifi.org>
Date: Sun Jul 20 06:47:12 2008 +0300
ath5k: Update phy calibration functions
* Enable I/Q calibration each time we have correction results (we
were only enabling calibration during reset). If we don't we commit
the same results each time calibration routine is called.
* Add some documentation and a TODO on nf calibration
* Return -EAGAIN on noise floor timeout/failure
Changes-licensed-under: ISC
Signed-off-by: Nick Kossifidis <mickflemm at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit cc6323c7d8c231d83e592ff9f7acf2cac5e016f7
Author: Nick Kossifidis <mick at madwifi.org>
Date: Sun Jul 20 06:44:43 2008 +0300
ath5k: Update channel functions
* Add channel function for RF2425 (got this from decompiling binary
HAL, i have no idea why there is a 5GHz section but i'm looking
into it)
* Update RF5112 channel function (also got this from decompiling binary HAL)
* Set JAPAN setting for channel 14 on all PHY chips
Changes-licensed-under: ISC
Signed-off-by: Nick Kossifidis <mickflemm at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 27bcdeed320c8c7dc0f502df43f6465f0d9840f1
Author: Nick Kossifidis <mick at madwifi.org>
Date: Sun Jul 20 06:42:47 2008 +0300
ath5k: Add RF2425 initial rfgain values
* Add initial RF gain settings for RF2425
Changes-licensed-under: ISC
Signed-off-by: Nick Kossifidis <mickflemm at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit df75dcddf99647d68f3b6b874effe5365c5024d9
Author: Nick Kossifidis <mick at madwifi.org>
Date: Sun Jul 20 06:41:26 2008 +0300
ath5k: Reorder calibration calls during reset and update hw_set_power
* Update ath5k_hw_reset and add some more documentation about PHY calibration
* Fix ath5k_hw_set_power to use AR5K_SLEEP_CTL_SLE_ALLOW for Network sleep
* Preserve sleep duration field while setting AR5K_SLEEP_CTL
and reduce delays & checks for register's status (got this from
decompiling & dumps, it works for me but it needs testing)
Changes-licensed-under: ISC
Signed-off-by: Nick Kossifidis <mickflemm at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit e2a0ccebc4ffabc1c7234cfd324299b5a936e0f2
Author: Nick Kossifidis <mick at madwifi.org>
Date: Sun Jul 20 06:38:16 2008 +0300
ath5k: Do ADC test during reset
* Do an ADC test during reset to match recent regdumps
Changes-licensed-under: ISC
Signed-off-by: Nick Kossifidis <mickflemm at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 2203d6be7ed17af81a1dc35a0af9806086743b02
Author: Nick Kossifidis <mick at madwifi.org>
Date: Sun Jul 20 06:36:52 2008 +0300
ath5k: Misc hw_reset updates
* Update hw_reset to calculate some of the values we were using as static
* Increase activation to rx delay
Changes-licensed-under: ISC
Signed-off-by: Nick Kossifidis <mickflemm at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit e5a4ad0dda8f79a984ba6391af65274b482b6703
Author: Nick Kossifidis <mick at madwifi.org>
Date: Sun Jul 20 06:34:39 2008 +0300
ath5k: Misc hw_attach fixes
* Correctly attach RF2425
* Update SREV values for Radio chips
* Update hw_attach to use new SPENDING values
* Write a bit after POST for some chips
Changes-licensed-under: ISC
Signed-off-by: Nick Kossifidis <mickflemm at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit ba37746e547e14703a5ac86560c6e056620bc4cf
Author: Nick Kossifidis <mick at madwifi.org>
Date: Sun Jul 20 06:32:32 2008 +0300
ath5k: Restore saved initval after POST
* Restore saved initial value after POST
Changes-licensed-under: ISC
Signed-off-by: Nick Kossifidis <mickflemm at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit 0bacdf303f72a3ed34252934114bc04e79222687
Author: Nick Kossifidis <mick at madwifi.org>
Date: Wed Jul 30 13:18:59 2008 +0300
ath5k: Update register list
* Update list of registers
* Use updated register macros inside hw.c, initvals.c and debug.c
Changes-licensed-under: ISC
Signed-off-by: Nick Kossifidis <mickflemm at gmail.com>
Signed-off-by: John W. Linville <linville at tuxdriver.com>
commit c6557e7f2b6ae76a44653d38f835174074c42e05
Author: Martin Schwidefsky <schwidefsky at de.ibm.com>
Date: Fri Aug 1 20:42:05 2008 +0200
[S390] move include/asm-s390 to arch/s390/include/asm
Signed-off-by: Martin Schwidefsky <schwidefsky at de.ibm.com>
commit 66b8bd3c405389213de1d6ba6c2565990f62004f
Author: Jeff Layton <jlayton at redhat.com>
Date: Fri Aug 1 17:54:32 2008 +0000
[CIFS] properly account for new user= field in SPNEGO upcall string allocation
...it doesn't look like it's being accounted for at the moment. Also
try to reorganize the calculation to make it a little more evident
what each piece means.
This should probably go to the stable series as well...
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 0a4949c4414af2eb91414bcd8e2a8ac3706f7dde
Author: David S. Miller <davem at davemloft.net>
Date: Thu Jul 31 20:40:46 2008 -0700
sparc64: Do not clobber %g7 in setcontext() trap.
That's the userland thread register, so we should never try to change
it like this.
Based upon glibc bug nptl/6577 and suggestions by Jakub Jelinek.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit dbf3e950679b2588e554baa4da94c445c7903e24
Author: David S. Miller <davem at davemloft.net>
Date: Thu Jul 31 20:33:43 2008 -0700
sparc64: Kill __show_regs().
The story is that what we used to do when we actually used
smp_report_regs() is that if you specifically only wanted to have the
current cpu's registers dumped you would call "__show_regs()"
otherwise you would call show_regs() which also invoked
smp_report_regs().
Now that we killed off smp_report_regs() there is no longer any
reason to have these two routines, just show_regs() is sufficient.
Also kill off a stray declaration of show_regs() in sparc64_ksym.c
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 6717c282e407650c29e7b058623d89f543015a33
Author: David S. Miller <davem at davemloft.net>
Date: Thu Jul 31 20:32:35 2008 -0700
sparc: Add __KERNEL__ ifdef protection to pt_regs helpers.
Some of them use 'bool' and whatnot and therefore are not
kosher for userspace, so don't export them there.
Reported by Roland McGrath.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 2f0e58ac3ad0bb2ec0924dc11f8e55d01f44ca90
Author: Jeff Layton <jlayton at redhat.com>
Date: Thu Jul 31 21:30:11 2008 +0000
[CIFS] remove level of indentation from decode_negTokenInit
Most of this function takes place inside of an unnecessary "else"
clause. The other 2 cases both return 0, so we can remove some
indentation here.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 3c4dc7115dfdb9e0450b7a3b0649948f5356d4af
Author: Francois Romieu <romieu at fr.zoreil.com>
Date: Thu Jul 31 22:51:18 2008 +0200
via-velocity: velocity_init_{rd/tx}_ring use kcalloc(..., GFP_KERNEL).
Allocate and free everyting outside of the locked section.
Spotted-by: Arjan van de Ven <arjan at linux.intel.com>
Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
Fixed-by: Seguier Regis <rseguier at e-teleport.net>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit 0fe9f15ee8bd652242a778ddfd30aa6d97a98e23
Author: Francois Romieu <romieu at fr.zoreil.com>
Date: Thu Jul 31 22:10:10 2008 +0200
via-velocity: separated struct allow wholesale copy during MTU changes.
It should help people fix the bugs in my code :o)
Signed-off-by: Francois Romieu <romieu at fr.zoreil.com>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
commit 9c636e30a33aa37873c53977c429f0fdad4ec0eb
Author: David S. Miller <davem at davemloft.net>
Date: Thu Jul 31 01:06:02 2008 -0700
sparc64: Kill smp_report_regs().
All the call sites are #if 0'd out and we have a much more
useful global cpu dumping facility these days. smp_report_regs()
is way too verbose to be usable.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit a014821340f068bea2fd39cb2578a043fc0dfc57
Author: David S. Miller <davem at davemloft.net>
Date: Thu Jul 31 00:58:35 2008 -0700
sparc64: Kill VERBOSE_SHOWREGS code.
It just clutters everything up and even though I wrote that hack I
can't remember having used it in the last 5 years or so.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 09ee167cbf3b7390c993c6699ce9fa84e55422bf
Author: David S. Miller <davem at davemloft.net>
Date: Wed Jul 30 22:35:00 2008 -0700
sparc64: Hook up trigger_all_cpu_backtrace().
We already have code that does this, but it is only currently attached
to sysrq-'y'.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 5afe27380bc42454254c9c83c045240249c15e35
Author: David S. Miller <davem at davemloft.net>
Date: Wed Jul 30 21:57:59 2008 -0700
sparc64: Make global reg dumping even more useful.
Record one more level of stack frame program counter.
Particularly when lockdep and all sorts of spinlock debugging is
enabled, figuring out the caller of spin_lock() is difficult when the
cpu is stuck on the lock.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit c9b23e0c302377ccff700bee663b878d04e4ef3a
Author: Florian Fainelli <florian.fainelli at telecomint.eu>
Date: Wed Jul 30 16:49:52 2008 -0700
sparc: Ignore drivers/video/console/promcon_tbl.c conmakehash generated file
Add drivers/video/console/promcon_tbl.c to the list of ignored files.
This file is generated by conmakehash against drivers/video/console/prom.uni.
Signed-off-by: Florian Fainelli <florian.fainelli at telecomint.eu>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit d72609e17fd93bb2f7e0f7e1bdc70b6d20e43843
Author: Mikael Pettersson <mikpe at it.uu.se>
Date: Wed Jul 30 15:40:50 2008 -0700
sparc64: FUTEX_OP_ANDN fix
Correct sparc64's implementation of FUTEX_OP_ANDN to do a
bitwise negate of the oparg parameter before applying the
AND operation. All other archs that support FUTEX_OP_ANDN
either negate oparg explicitly (frv, ia64, mips, sh, x86),
or do so indirectly by using an and-not instruction (powerpc).
Since sparc64 has and-not, I chose to use that solution.
I've not found any use of FUTEX_OP_ANDN in glibc so the
impact of this bug is probably minor. But other user-space
components may try to use it so it should still get fixed.
Signed-off-by: Mikael Pettersson <mikpe at it.uu.se>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit b962a286e500c6259af8ba133361f8528eed9172
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Wed Jul 30 21:24:56 2008 +0100
[ARM] initrd: claim initrd memory exclusively
Claim the initrd memory exclusively, and order other memory
reservations beforehand. This allows us to determine whether
the initrd memory was overwritten, and disable the initrd in
that case.
This avoids a 'bad page state' bug.
Tested-by: Ralph Siemsen <ralphs at netwinder.org>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 52fd8ca6ad4124c15952ded35cfcf6adbd7ae8d4
Author: Vegard Nossum <vegard.nossum at gmail.com>
Date: Wed Jul 30 09:29:06 2008 -0700
IB/ipath: Use unsigned long for irq flags
A few functions in the ipath driver incorrectly use unsigned int to
hold irq flags for spin_lock_irqsave().
This patch was generated using the Coccinelle framework with the
following semantic patch:
The semantic patch I used was this:
@@
expression lock;
identifier flags;
expression subclass;
@@
- unsigned int flags;
+ unsigned long flags;
...
<+...
(
spin_lock_irqsave(lock, flags)
|
_spin_lock_irqsave(lock)
|
spin_unlock_irqrestore(lock, flags)
|
_spin_unlock_irqrestore(lock, flags)
|
read_lock_irqsave(lock, flags)
|
_read_lock_irqsave(lock)
|
read_unlock_irqrestore(lock, flags)
|
_read_unlock_irqrestore(lock, flags)
|
write_lock_irqsave(lock, flags)
|
_write_lock_irqsave(lock)
|
write_unlock_irqrestore(lock, flags)
|
_write_unlock_irqrestore(lock, flags)
|
spin_lock_irqsave_nested(lock, flags, subclass)
|
_spin_lock_irqsave_nested(lock, subclass)
|
spin_unlock_irqrestore(lock, flags)
|
_spin_unlock_irqrestore(lock, flags)
|
_raw_spin_lock_flags(lock, flags)
|
__raw_spin_lock_flags(lock, flags)
)
...+>
Cc: Ralph Campbell <ralph.campbell at qlogic.com>
Cc: Julia Lawall <julia at diku.dk>
Cc: Alexey Dobriyan <adobriyan at gmail.com>
Signed-off-by: Vegard Nossum <vegard.nossum at gmail.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit e8bac9e0647dd04c83fd0bfe7cdfe2f6dfb100d0
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Tue Jul 29 12:52:20 2008 -0500
[SCSI] scsi_transport_spi: fix oops in revalidate
The class_device->device conversion is causing an oops in revalidate
because it's assuming that the device_for_each_child iterator will only
return struct scsi_device children. The conversion made all former
class_devices children of the device as well, so this assumption is
broken. Fix it.
Cc: Stable Tree <stable at kernel.org>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit 671a99c8eb2f1dde08ac5538d8cd912047c61ddf
Author: James Bottomley <James.Bottomley at HansenPartnership.com>
Date: Tue Jul 29 11:38:25 2008 -0500
[SCSI] ses: fix VPD inquiry overrun
There are a few kerneloops.org reports like this one:
http://www.kerneloops.org/search.php?search=ses_match_to_enclosure
That seem to imply we're running off the end of the VPD inquiry data
(although at 512 bytes, it should be long enough for just about
anything). we should be using correctly sized buffers anyway, so put
those in and hope this oops goes away.
Cc: Stable Tree <stable at kernel.org>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit ad337591f4fd20de6a0ca03d6715267a5c1d2b16
Author: Tim Wright <timw at splhi.com>
Date: Sun Jul 27 17:50:38 2008 -0700
[SCSI] block: Fix miscalculation of sg_io timeout in CDROM_SEND_PACKET handler.
It seems cdrwtool in the udftools has been unusable on "modern" kernels
for some time. A Google search reveals many people with the same issue
but no solution (cdrwtool fails to format the disk). After spending some
time tracking down the issue, it comes down to the following:
The udftools still use the older CDROM_SEND_PACKET interface to send
things like FORMAT_UNIT through to the drive. They should really be
updated, but that's another story. Since most distros are using libata
now, the cd or dvd burner appears as a SCSI device, and we wind up in
block/scsi_ioctl.c. Here, the code tries to take the "struct
cdrom_generic_command" and translate it and stuff it into a "struct
sg_io_hdr" structure so it can pass it to the modern sg_io() routine
instead. Unfortunately, there is one error, or rather an omission in the
translation. The timeout that is passed in in the "struct
cdrom_generic_command" is in HZ=100 units, and this is modified and
correctly converted to jiffies by use of clock_t_to_jiffies(). However,
a little further down, this cgc.timeout value in jiffies is simply
copied into the sg_io_hdr timeout, which should be in milliseconds.
Since most modern x86 kernels seems to be getting build with HZ=250, the
timeout that is passed to sg_io and eventually converted to the
timeout_per_command member of the scsi_cmnd structure is now four times
too small. Since cdrwtool tries to set the timeout to one hour for the
FORMAT_UNIT command, and it takes about 20 minutes to format a 4x CDRW,
the SCSI error-handler kicks in after the FORMAT_UNIT completes because
it took longer than the incorrectly-calculated timeout.
[jejb: fix up whitespace]
Signed-off-by: Tim Wright <timw at splhi.com>
Cc: Stable Tree <stable at kernel.org>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit dd07428b44944b42f699408fe31af47977f1e733
Author: HighPoint Linux Team <linux at highpoint-tech.com>
Date: Fri Jul 25 13:29:24 2008 +0800
[SCSI] hptiop: add more PCI device IDs
Add PCI device ID for new adapter models.
Signed-off-by: HighPoint Linux Team <linux at highpoint-tech.com>
Cc: Stable Tree <stable at kernel.org>
Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
commit e08198169ec5facb3d85bb455efa44a2f8327842
Author: Roland Dreier <rolandd at cisco.com>
Date: Wed Jul 30 07:21:46 2008 -0700
IPoIB/cm: Set correct SG list in ipoib_cm_init_rx_wr()
wr->sg_list should be set to the sge pointer passed in, not
priv->cm.rx_sge.
Reported-by: Hoang-Nam Nguyen <HNGUYEN at de.ibm.com>
Signed-off-by: Roland Dreier <rolandd at cisco.com>
commit 19fd3cabbabe5d37b83f833a1593592ed9878236
Author: Stephen Rothwell <sfr at canb.auug.org.au>
Date: Tue Jul 29 23:54:33 2008 -0700
sparc: merge of_platform_{32,64}.h
Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 71fc324b5beded4d55dc67fd39aab8b78c6898cb
Author: David S. Miller <davem at davemloft.net>
Date: Tue Jul 29 23:47:17 2008 -0700
sparc64: Kill isa_bus_type.
I forgot to delete this when I removed the ISA bus layer
from the sparc ports.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 176803562b541ebf4744e44e6600fb60660255d5
Author: Shirish Pargaonkar <shirishp at us.ibm.com>
Date: Tue Jul 29 21:26:13 2008 +0000
[CIFS] cifs send2 not retrying enough in some cases on full socket
There are cases in which, on a full socket which requires retry on
sending data by the app (cifs in this case), that we were not
retrying since we did not reinitialize a counter.
This fixes the retry logic to retry up to 15 seconds on stuck
sockets.
Signed-off-by: Shirish Pargaonkar <shirishp at us.ibm.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 44051fed5763c4f55eb8a7eeae6ede52bc15f85f
Author: Steve French <sfrench at us.ibm.com>
Date: Tue Jul 29 21:20:14 2008 +0000
[CIFS] oid should also be checked against class in cifs asn
The oid coming back from asn1_header_decode is a primitive object so
class should be checked to be universal.
Acked-by: Love Hörnquist Ã
strand <lha at kth.se>
Signed-off-by: Steve French <sfrench at us.ibm.com>
commit 905a09d57afcc49511de18a95605c11ad9c88649
Author: Eric Miao <eric.miao at marvell.com>
Date: Fri Jun 6 16:34:03 2008 +0800
[ARM] pxa: add support for L2 outer cache on XScale3 (attempt 2)
(20072fd0c93349e19527dd2fa9588b4335960e62 lost most of its changes
somehow, came from a mbox archive applied with git-am. No idea
what happened. This puts back the missing bits. --rmk)
The initial patch from Lothar, and Lennert make it into a cleaner
one, modified and tested on PXA320 by Eric Miao.
This patch moves the L2 cache operations out of proc-xsc3.S into
dedicated outer cache support code.
CACHE_XSC3L2 can be deselected so no L2 cache specific code will be
linked in, and that L2 enable bit will not be set, this applies to
the following cases:
a. _only_ PXA300/PXA310 support included and no L2 cache wanted
b. PXA320 support included, but want L2 be disabled
So the enabling of L2 depends on two things:
- CACHE_XSC3L2 is selected
- and L2 cache is present
Where the latter is only a safeguard (previous testing shows it works
OK even when this bit is turned on).
IXP series of processors with XScale3 cannot disable L2 cache for the
moment since they depend on the L2 cache for its coherent memory, so
IXP may always select CACHE_XSC3L2.
Other L2 relevant bits are always turned on (i.e. the original code
enclosed by #if L2_CACHE_ENABLED .. #endif), as they showed no side
effects. Specifically, these bits are:
- OC bits in TTBASE register (table walk outer cache attributes)
- LLR Outer Cache Attributes (OC) in Auxiliary Control Register
Signed-off-by: Lothar WaÃ<9f>mann <LW at KARO-electronics.de>
Signed-off-by: Lennert Buytenhek <buytenh at marvell.com>
Signed-off-by: Eric Miao <eric.miao at marvell.com>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit e76e3ac69e62d3f93e935526bc9afa371e7f38ba
Merge: 7c896834735f497cc405068d16a51717f993af7f 86183a5fd0ce67cb28d6e4af4775105edc8872b7
Author: Russell King <rmk at dyn-67.arm.linux.org.uk>
Date: Mon Jul 28 18:45:57 2008 +0100
Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6
commit 7c896834735f497cc405068d16a51717f993af7f
Author: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Date: Mon Jul 28 16:57:22 2008 +0100
[ARM] 5180/1: at91: Fix at91_nand -> atmel_nand rename fallout
struct at91_nand has been renamed atmel_nand. Fix the four boards that
were added since the patch was created.
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen at atmel.com>
Acked-by: Andrew Victor <linux at maxim.org.za>
Signed-off-by: Russell King <rmk+kernel at arm.linux.org.uk>
commit 0e09c863dbb8b1816ebc106df1a1cae4c588ce0e
Author: Dominik Brodowski <linux at dominikbrodowski.net>
Date: Mon Jul 28 16:37:10 2008 +0200
pcmcia: rsrc_nonstatic: check value, not pointer
Bug found by Harvey Harrison and Stephen Rothwell.
Signed-off-by: Dominik Brodowski <linux at dominikbrodowski.net>
commit 86183a5fd0ce67cb28d6e4af4775105edc8872b7
Author: Sascha Hauer <s.hauer at pengutronix.de>
Date: Thu Jul 24 23:50:35 2008 +0200
[ARM] add Sascha Hauer as Freescale i.MX Maintainer
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
commit 79a13b29782e252d4f4e8f6111b978519b876cf7
Author: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Date: Mon Jul 21 18:44:13 2008 +0300
[ARM] i.MX: add missing clock functions exports
Export missing Clock API symbols.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
commit d7098e31404a25f70f82aa7513e7f5893763576b
Author: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Date: Thu Jul 17 19:10:20 2008 +0300
[ARM] i.MX: remove set_imx_fb_info() export
Remove not needed export and fix warning:
WARNING: vmlinux.o(__ksymtab+0x400): Section mismatch in reference from the variable __ksymtab_set_imx_fb_info to the function .init.text:set_imx_fb_info()
The symbol set_imx_fb_info is exported and annotated __init
Fix this by removing the __init annotation of set_imx_fb_info or drop the export.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
commit 2809fc06f2fc0aac180644cabf9330e50f015bbb
Author: Sascha Hauer <s.hauer at pengutronix.de>
Date: Fri Jul 18 08:33:26 2008 +0200
[ARM] mx1ads: make mmc platform data available for modules
Signed-off-by: Paulius Zaleckas <paulius.zaleckas at teltonika.lt>
Acked-by: Pavel Pisa <pisa at cmp.felk.cvut.cz>
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
commit 221d62c1882d05fc20163347d7e6af279bdffb8e
Author: Sascha Hauer <s.hauer at pengutronix.de>
Date: Wed Jul 16 08:46:08 2008 +0200
[ARM] mx2: add missing Kconfig dependency
It seems this small label was lost in the last merge. Without it
no CPU type is selected for the MX2 family of processors. And a build
will fail badly...
Signed-off-by: Juergen Beisert <j.beisert at pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
commit 17b6f586b8e27914b36c9ed7f3e4d289e6274a80
Author: David S. Miller <davem at davemloft.net>
Date: Mon Jul 28 00:44:29 2008 -0700
sparc64: Fix global reg snapshotting on self-cpu.
We were picking %i7 out of the wrong register window
stack slot.
Signed-off-by: David S. Miller <davem at davemloft.net>
commit 00b32b7fb671e797bdd2736524a497f18a8df7bf
Author: Theodore Ts'o <tytso at mit.edu>
Date: Sat Jul 26 17:33:53 2008 -0400
ext4: unexport jbd2_journal_update_superblock
Remove the unused EXPORT_SYMBOL(jbd2_journal_update_superblock).
Signed-off-by: Adrian Bunk <bunk at kernel.org>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 2b2d6d019724de6e51ac5bcf22b5ef969daefa8b
Author: Theodore Ts'o <tytso at mit.edu>
Date: Sat Jul 26 16:15:44 2008 -0400
ext4: Cleanup whitespace and other miscellaneous style issues
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit ec05e868ac80cc8fc7de6e5cf773b232198e49af
Author: Li Zefan <lizf at cn.fujitsu.com>
Date: Thu Jul 24 12:49:59 2008 -0400
ext4: improve ext4_fill_flex_info() a bit
- use kzalloc() instead of kmalloc() + memset()
- improve a printk info
Signed-off-by: Li Zefan <lizf at cn.fujitsu.com>
Signed-off-by: Theodore Ts'o <tytso at mit.edu>
commit 867240f7b2a37b1be4ba37d904a9064a96c82099
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Thu Jul 3 00:39:46 2008 +0200
WAN: Use u32 type instead of u_int32_t in LMC driver.
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit d507911c3a451986b3501417c78b568f3850b8ef
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Wed Jul 2 20:55:58 2008 +0200
WAN: don't mention syncppp in z8530 DocBook.
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit 64bef7630ad5b0ccfdd73973e95cf7b7e39224d0
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Wed Jul 2 20:46:21 2008 +0200
WAN: Port LMC driver to generic HDLC
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit 52e8a6a2d8dc19002d1757870d16051157ce999c
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Wed Jul 2 17:47:52 2008 +0200
WAN: Convert Zilog-based drivers to generic HDLC
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit aca257530f7d681b953961090ad729c32aa5ad62
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Tue Jul 1 23:40:29 2008 +0200
WAN: Port COSA driver to generic HDLC.
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit 0bee8db8f63b099412fdbce5b55b01d9f177951d
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Tue Jul 1 22:04:01 2008 +0200
WAN: farsync driver no longer uses syncppp.c directly
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit b22267d3883ebc76093e9f36c4c738125e092402
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Tue Jul 1 21:43:39 2008 +0200
WAN: Convert PC300 driver to use normal u8/u16/u32 types
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit c36936ce4bc6d2a0d6520bd798e85abbb139c2aa
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Tue Jul 1 21:24:14 2008 +0200
WAN: Remove dead code from PC300 driver, part #2
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit ea966165a306ad4243b7bf62c848288c4286a8b7
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Tue Jul 1 21:14:43 2008 +0200
WAN: Remove dead code from PC300 driver, part #1
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit c1a0f0cdf95569c06946eed81c2fc7e04b272db4
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Tue Jul 1 20:35:06 2008 +0200
WAN: Remove unneeded "#include <net/syncppp.h>"
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit a8817d2f6d59b0caeacf6071f56a83164b474a32
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Tue Jul 1 20:24:10 2008 +0200
wanmain.c doesn't need syncppp.h
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit a24e202e3ffdbd1da45ceab8e60824720c6ab7fd
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Tue Jul 1 20:18:49 2008 +0200
Remove dead code from wanmain.c, CONFIG_WANPIPE_MULTPPP doesn't exist
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit efa415840d462caf30002d259db20338b546a94b
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Tue Jul 1 15:28:10 2008 +0200
Remove bogus variables from syncppp.[ch]
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit 86f584f08767160a745a50ed675e12b8f8bfbf30
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Tue Jul 1 15:10:11 2008 +0200
Remove bogus dosyncppp variable from synclink drivers.
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit 4dfce4075aa4e2eee35e52a78dbabfe37d94c908
Author: Krzysztof HaÅasa <khc at pm.waw.pl>
Date: Mon Jun 30 19:06:40 2008 +0200
WAN: cosmetic changes to generic HDLC
Signed-off-by: Krzysztof HaÅasa <khc at pm.waw.pl>
commit 12219aea6b944e36795267be31d43f9c484841be
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date: Thu Jul 17 16:12:08 2008 -0400
ext4: Cleanup the block reservation code path
The truncate patch should not use the i_allocated_meta_blocks
value. So add seperate functions to be used in the truncate
and alloc path. We also need to release the meta-data block
that we reserved for the blocks that we are truncating.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Signed-off-by: Theodore Ts'o <tytso at mit.edu>
commit 34071da71a665d8c81e3b3467c9a2e7c56386fec
Author: Theodore Ts'o <tytso at mit.edu>
Date: Fri Aug 1 21:59:19 2008 -0400
ext4: don't assume extents can't cross block groups when truncating
With the FLEX_BG layout, there is no reason why extents can't cross
block groups, so make the truncate code reserve enough credits so we
don't BUG if we come across such an extent.
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit bc965ab3f2b4b7bb898b11d61d25295c2053b8ac
Author: Theodore Ts'o <tytso at mit.edu>
Date: Sat Aug 2 21:10:38 2008 -0400
ext4: Fix lack of credits BUG() when deleting a badly fragmented inode
The extents codepath for ext4_truncate() requests journal transaction
credits in very small chunks, requesting only what is needed. This
means there may not be enough credits left on the transaction handle
after ext4_truncate() returns and then when ext4_delete_inode() tries
finish up its work, it may not have enough transaction credits,
causing a BUG() oops in the jbd2 core.
Also, reserve an extra 2 blocks when starting an ext4_delete_inode()
since we need to update the inode bitmap, as well as update the
orphaned inode linked list.
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 0123c93998511978556b03d2bb023af92aa24d55
Author: Theodore Ts'o <tytso at mit.edu>
Date: Fri Aug 1 20:57:54 2008 -0400
ext4: Fix ext4_ext_journal_restart()
The ext4_ext_journal_restart() is a convenience function which checks
to see if the requested number of credits is present, and if so it
closes the current transaction and attaches the current handle to the
new transaction. Unfortunately, it wasn't proprely checking the
return value from ext4_journal_extend(), so it was starting a new
transaction when one was not necessary, and returning an error when
all that was necessary was to restart the handle with a new
transaction.
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit d5a0d4f732af3438e592efab4cb80076d1dd81b5
Author: Eric Sandeen <sandeen at redhat.com>
Date: Sat Aug 2 18:51:06 2008 -0400
ext4: fix ext4_da_write_begin error path
ext4_da_write_begin needs to call journal_stop before returning,
if the page allocation fails.
Signed-off-by: Eric Sandeen <sandeen at redhat.com>
Acked-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit e9e34f4e8f42177c66754fec1edfd35e70c18f99
Author: Hidehiro Kawai <hidehiro.kawai.ez at hitachi.com>
Date: Thu Jul 31 22:26:04 2008 -0400
jbd2: don't abort if flushing file data failed
In ordered mode, the current jbd2 aborts the journal if a file data buffer
has an error. But this behavior is unintended, and we found that it has
been adopted accidentally.
This patch undoes it and just calls printk() instead of aborting the
journal. Unlike a similar patch for ext3/jbd, file data buffers are
written via generic_writepages(). But we also need to set AS_EIO
into their mappings because wait_on_page_writeback_range() clears
AS_EIO before a user process sees it.
Signed-off-by: Hidehiro Kawai <hidehiro.kawai.ez at hitachi.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 9c83a923c67df311c467ec956009f0eb4019195d
Author: Hidehiro Kawai <hidehiro.kawai.ez at hitachi.com>
Date: Sat Jul 26 16:39:26 2008 -0400
ext4: don't read inode block if the buffer has a write error
A transient I/O error can corrupt inode data. Here is the scenario:
(1) update inode_A at the block_B
(2) pdflush writes out new inode_A to the filesystem, but it results
in write I/O error, at this point, BH_Uptodate flag of the buffer
for block_B is cleared and BH_Write_EIO is set
(3) create new inode_C which located at block_B, and
__ext4_get_inode_loc() tries to read on-disk block_B because the
buffer is not uptodate
(4) if it can read on-disk block_B successfully, inode_A is
overwritten by old data
This patch makes __ext4_get_inode_loc() not read the inode block if the
buffer has BH_Write_EIO flag. In this case, the buffer should have the
latest information, so setting the uptodate flag to the buffer (this
avoids WARN_ON_ONCE() in mark_buffer_dirty().)
According to this change, we would need to test BH_Write_EIO flag for the
error checking. Currently nobody checks write I/O errors on metadata
buffers, but it will be done in other patches I'm working on.
Signed-off-by: Hidehiro Kawai <hidehiro.kawai.ez at hitachi.com>
Cc: sugita <yumiko.sugita.yf at hitachi.com>
Cc: Satoshi OSHIMA <satoshi.oshima.fk at hitachi.com>
Cc: Nick Piggin <nickpiggin at yahoo.com.au>
Cc: Jan Kara <jack at ucw.cz>
Cc: <linux-ext4 at vger.kernel.org>
Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
Signed-off-by: Theodore Ts'o <tytso at mit.edu>
commit 6be2ded1d7c51b39144b9f07d2c839e1bd8707f1
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date: Wed Jul 23 14:14:05 2008 -0400
ext4: Don't allow lg prealloc list to be grow large.
Currently, the locality group prealloc list is freed only when there
is a block allocation failure. This can result in large number of
entries in the preallocation list making ext4_mb_use_preallocated()
expensive.
To fix this, we convert the locality group prealloc list to a hash
list. The hash index is the order of number of blocks in the prealloc
space with a max order of 9. When adding prealloc space to the list we
make sure total entries for each order does not exceed 8. If it is
more than 8 we discard few entries and make sure the we have only <= 5
entries.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Signed-off-by: Theodore Ts'o <tytso at mit.edu>
commit 1320cbcf771a20b44cf580712b843d213ae75cd3
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date: Wed Jul 23 14:09:26 2008 -0400
ext4: Convert the usage of NR_CPUS to nr_cpu_ids.
NR_CPUS can be really large. We should be using nr_cpu_ids instead.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Signed-off-by: Theodore Ts'o <tytso at mit.edu>
commit ce89f46cb833f89c58a08240faa6b5e963086b8a
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date: Wed Jul 23 14:09:29 2008 -0400
ext4: Improve error handling in mballoc
Don't call BUG_ON on file system failures. Instead use ext4_error and
also handle the continue case properly.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Signed-off-by: Theodore Ts'o <tytso at mit.edu>
commit b5f10eed8125702929e57cca7e5956b1b9b6d015
Author: Eric Sandeen <sandeen at redhat.com>
Date: Sat Aug 2 21:21:08 2008 -0400
ext4: lock block groups when initializing
I noticed when filling a 1T filesystem with 4 threads using the
fs_mark benchmark:
fs_mark -d /mnt/test -D 256 -n 100000 -t 4 -s 20480 -F -S 0
that I occasionally got checksum mismatch errors:
EXT4-fs error (device sdb): ext4_init_inode_bitmap: Checksum bad for group 6935
etc. I'd reliably get 4-5 of them during the run.
It appears that the problem is likely a race to init the bg's
when the uninit_bg feature is enabled.
With the patch below, which adds sb_bgl_locking around initialization,
I was able to complete several runs with no errors or warnings.
Signed-off-by: Eric Sandeen <sandeen at redhat.com>
Signed-off-by: Theodore Ts'o <tytso at mit.edu>
commit e29d1cde63be0b5f1739416b5574a83c34bf8eeb
Author: Eric Sandeen <sandeen at redhat.com>
Date: Sat Aug 2 21:21:02 2008 -0400
ext4: sync up block and inode bitmap reading functions
ext4_read_block_bitmap and read_inode_bitmap do essentially
the same thing, and yet they are structured quite differently.
I came across this difference while looking at doing bg locking
during bg initialization.
This patch:
* removes unnecessary casts in the error messages
* renames read_inode_bitmap to ext4_read_inode_bitmap
* and more substantially, restructures the inode bitmap
reading function to be more like the block bitmap counterpart.
The change to the inode bitmap reader simplifies the locking
to be applied in the next patch.
Signed-off-by: Eric Sandeen <sandeen at redhat.com>
Signed-off-by: Theodore Ts'o <tytso at mit.edu>
commit 8a266467b8c4841ca994d0fe59f39e584650e3df
Author: Theodore Ts'o <tytso at mit.edu>
Date: Sat Jul 26 14:34:21 2008 -0400
ext4: Allow read/only mounts with corrupted block group checksums
If the block group checksums are corrupted, still allow the mount to
succeed, so e2fsck can have a chance to try to fix things up. Add
code in the remount r/w path to make sure the block group checksums
are valid before allowing the filesystem to be remounted read/write.
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit d03856bd5e5abac717da137dc60fe4a691769bd0
Author: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Date: Sat Aug 2 18:51:32 2008 -0400
ext4: Fix data corruption when writing to prealloc area
Inserting an extent can cause a new entry in the already existing index
block. That doesn't increase the depth of the instead. Instead it adds a
new leaf block. Now with the new leaf block the path information
corresponding to the logical block should be fetched from the new block.
The old path will be pointing to the old leaf block.
We need to recalucate the path information on extent insert
even if depth doesn't change. Without this change, the extent merge
after converting an unwritten extent to initialized extent takes the wrong
extent and cause data corruption.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar at linux.vnet.ibm.com>
Signed-off-by: Mingming Cao <cmm at us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso at mit.edu>
commit 7c4be5aa8dce9ba37fdd971d5560490d9e30c270
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:10:02 2008 +0100
[WATCHDOG 57/57] wdt501/pci: Clean up, coding style and switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit f2b79c6ede54cf07355ac8d8f3044d682cd0c5ca
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:09:57 2008 +0100
[WATCHDOG 56/57] wdt977: clean up, coding style and switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit d0e58eed05f9baf77c4f75e794ae245f6dae240a
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:09:51 2008 +0100
[WATCHDOG 55/57] wdt285: switch to unlocked_ioctl and tidy up oddments of coding style
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit dae67a2835149e6518a78c5cf37d6de715c214fc
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:09:45 2008 +0100
[WATCHDOG 54/57] wdrtas: clean up, coding style, switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 694b16b2bd23bbd13163762c29f1e7885fe0da41
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:09:40 2008 +0100
[WATCHDOG 53/57] wafer5823wdt: Clean up, coding style, switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 84af401af831567967250dec9c15680bceede5e4
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:09:34 2008 +0100
[WATCHDOG 52/57] w83977f_wdt: clean up, coding style and switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit c1cfd1a2ffc5ee58f744b1ceb0887285df187668
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:09:29 2008 +0100
[WATCHDOG 51/57] w83877f_wdt: clean up code, coding style, switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit c1c8dd39f53e56d6a92aa6a2db9940d912d7ee4c
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:09:23 2008 +0100
[WATCHDOG 50/57] w83697hf_wdt: cleanup, coding style and switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 46a3949ddc422882cc27c88d078838cd31885d78
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:09:18 2008 +0100
[WATCHDOG 49/57] w83627hf: coding style, clean up and switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 8dc244f7deac4c0e95ce0ffd26f494bb6e1534c0
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:09:12 2008 +0100
[WATCHDOG 48/57] txx9: Fix locking, switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit f92d3749d70265468e28643652c0e32c5a56cd2b
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:09:06 2008 +0100
[WATCHDOG 47/57] softdog: clean up, coding style and switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 598467938dd8bcdcd4d88e9102c609f4caa9d9ef
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:09:00 2008 +0100
[WATCHDOG 46/57] smsc37b787_wdt: coding style, switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 70b814ec1a484279a51bf9f7193551b996627247
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:08:55 2008 +0100
[WATCHDOG 45/57] shwdt: coding style, cleanup, switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 9b748ed03cabf533a815e5ffc50108a21c98e40c
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:08:49 2008 +0100
[WATCHDOG 44/57] scx200_wdt: clean up and switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit ff94806057fba557abd6295f7313f5f9e972a48f
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:08:44 2008 +0100
[WATCHDOG 43/57] sc520_wdt: Clean up and switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit d14bccaadaa49b651fabcd1298b6ea07db3af552
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:08:38 2008 +0100
[WATCHDOG 42/57] sc1200_wdt: clean up, fix locking and use unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit df3c9de3dee539c6b18a9c0797b37f6cb90c6ccb
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:08:33 2008 +0100
[WATCHDOG 41/57] sb_wdog: Clean up and switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit f4f6f65a554d4a11e544070c39eea7c2ecc3ebfb
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:08:27 2008 +0100
[WATCHDOG 40/57] sbc_epx_c3_wdt: switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 9f53c8de1aef08cad678dcda0f85fd8914ad7666
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:08:22 2008 +0100
[WATCHDOG 39/57] sbc8360: clean up
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 619a8a2bb1d0c3f8270da4496a30f1e83e6eab5e
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:08:16 2008 +0100
[WATCHDOG 38/57] stg7240_wdt: unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 1780de41406d783aa57459ba636a09aeda21d180
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:08:11 2008 +0100
[WATCHDOG 37/57] sbc60xxwdt: clean up and switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit f19e031265dc6e05511308a6ecb9637e335b45b0
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:08:05 2008 +0100
[WATCHDOG 36/57] sa1100_wdt: Switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit edef7a93f9414e1d4864150eabb49a618222c2bd
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:08:00 2008 +0100
[WATCHDOG 35/57] s3c2410: watchdog cleanup and switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 72d5c0505bafae1a393f50e169e20b682d37f28e
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:07:54 2008 +0100
[WATCHDOG 34/57] rm9k_wdt: clean up
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 84ca995c258df70a8914866e8c996845003ff938
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:07:48 2008 +0100
[WATCHDOG 33/57] pnx4008_wdt: unlocked_ioctl setup
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 261dcc70aae926ba7b9218da7302f0ad2f665b79
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:07:43 2008 +0100
[WATCHDOG 32/57] pcwd: clean up, unlocked_ioctl usage
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit aee334c23c9a559ce6334bd6ba74a5708b600ada
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:07:37 2008 +0100
[WATCHDOG 31/57] pc87413_wdt: clean up, coding style, unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 12b9df7d21d0eedfaaee925f8f9c9aafb1cafa2f
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:07:32 2008 +0100
[WATCHDOG 30/57] omap_wdt: locking, unlocked_ioctl, tidy
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit a86b849868f40f83781f7a7e32e5e5ef939dc570
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:07:26 2008 +0100
[WATCHDOG 29/57] mv64x60_wdt: clean up and locking checks
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit ed78c2da14924793310d96fa4b6a8c3a4172f72f
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:07:21 2008 +0100
[WATCHDOG 28/57] mtx-1_wdt: clean up, coding style, unlocked ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 83ab1a53f219c8139199633f60ab0ef88ef18c54
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:07:15 2008 +0100
[WATCHDOG 27/57] mpcore watchdog: unlocked_ioctl and BKl work
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit f26ef3dc69467e135e2b9555e44a088aee5c7d8f
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:07:09 2008 +0100
[WATCHDOG 26/57] mpc watchdog: clean up and locking
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 3930964532f8e454910cbe0d9909e98a02d9f552
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:07:04 2008 +0100
[WATCHDOG 25/57] mixcomwd: coding style locking, unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 325ea4d3a8a90b19d7a076714d0f8f238a5a6a69
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:06:59 2008 +0100
[WATCHDOG 24/57] machzwd: clean up, coding style, unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit f4fabce15bb9b547f934e2b6f0e5e01044108e4d
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:06:53 2008 +0100
[WATCHDOG 23/57] ks8695_wdt: clean up, coding style, unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 20d35f3e50ea7e573f9568b9fce4e98523aaee5d
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:06:48 2008 +0100
[WATCHDOG 22/57] ixp4xx_wdt: unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 640b4f685784feafcd99c24582c5eb3ea36c3c60
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:06:42 2008 +0100
[WATCHDOG 21/57] ixp2000_wdt: clean up and unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 00e9c2059aba0a0d67d144229bac82d403c2f42a
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:06:36 2008 +0100
[WATCHDOG 20/57] booke watchdog: clean up and unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 9a5f50d34b0927d2f43549b6d172b8f458b6b620
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:06:30 2008 +0100
[WATCHDOG 19/57] bfin: watchdog cleanup and unlocked_ioctl
Scan, tidy and check for unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 0e6fa3fb38e2c89ba9abce9a8b74867f07d20d19
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:06:25 2008 +0100
[WATCHDOG 18/57] iTCO: unlocked_ioctl, coding style and cleanup
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 30abcec14573e3462f18d63f4a8f154a23689f1b
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:06:19 2008 +0100
[WATCHDOG 17/57] it8712f: unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 02e3814e193ff798676793016851bc222366dc6a
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:06:14 2008 +0100
[WATCHDOG 16/57] iop: watchdog switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 9b9dbcca3fa13acd64dbb9258bfe997809d6073b
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:06:08 2008 +0100
[WATCHDOG 15/57] indydog: Clean up and tidy
Switch to unlocked_ioctl as well
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 02355c329a302c5ee81cacff0b7df7d306174981
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:06:03 2008 +0100
[WATCHDOG 14/57] ibmasr: coding style, locking verify
There is a new #if 0 section here which is a suggested fix for the horrible
PCI hack in the existing code. Would be good if someone with a box that uses
this device could test it.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 0829291ea4a25c3c2ca4fba34aa38a1ee1e0b94b
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:05:57 2008 +0100
[WATCHDOG 13/57] i6300esb: Style, unlocked_ioctl, cleanup
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 2e43ba73d4e2d34ddb9843e30480be3752514c16
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:05:52 2008 +0100
[WATCHDOG 12/57] ib700wdt: clean up and switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 6513e2a03887c6c9bd0b30593827a01ce3f7b542
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:05:46 2008 +0100
[WATCHDOG 11/57] hpwdt: couple of include cleanups
clean-up includes
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 89ea2429873e69201173f3606ab04d751f737cc4
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:05:41 2008 +0100
[WATCHDOG 10/57] eurotechwdt: unlocked_ioctl, code lock check and tidy
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit f339e2ac9d65656e6d18c92b1ddc4a7801373318
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:05:35 2008 +0100
[WATCHDOG 09/57] ep93xx_wdt: unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit f78b0a8f27618b492dd2e1a8f5e4ce6f89b3c961
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:05:30 2008 +0100
[WATCHDOG 08/57] davinci_wdt: unlocked_ioctl and check locking
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 6f932f18de7f0e22a1bdae5d0040eb5d8e4a6777
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:05:24 2008 +0100
[WATCHDOG 07/57] cpu5_wdt: switch to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 2760600da2a13d5a2a335ba012d0f3ad5df4c098
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:05:19 2008 +0100
[WATCHDOG 06/57] at91: watchdog to unlocked_ioctl
Review and switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit a6be8e5ff95e12190fd5e5158eb553255677292f
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:05:13 2008 +0100
[WATCHDOG 05/57] atp watchdog
Switch to unlocked_ioctl
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit fbd4714907cd54ba74b8d35228813a060ae0176a
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:05:07 2008 +0100
[WATCHDOG 04/57] AR7 watchdog
Fix locking
Use unlocked_ioctl
Remove semaphores
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 173d95bc2e68baf73eb89fb9ef1cc63a66f581a5
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:04:57 2008 +0100
[WATCHDOG 03/57] ali: watchdog locking and style
Clean up and check locking
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit b6b4d9b8d07e34f745871d3109c84894db29041b
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:04:51 2008 +0100
[WATCHDOG 02/57] clean up and check advantech watchdog
Clean up the advantech watchdog code and inspect for BKL problems
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
commit 94da1e2eff319994eefc7d04de7c911f64146e88
Author: Alan Cox <alan at redhat.com>
Date: Mon May 19 14:04:46 2008 +0100
[WATCHDOG 01/57] Clean acquirewdt and check for BKL dependancies
This brings the file into line with coding style.
Signed-off-by: Alan Cox <alan at redhat.com>
Signed-off-by: Wim Van Sebroeck <wim at iguana.be>
More information about the commitlog
mailing list