kernel.git
11 years agolocal-build-scripts.patch
warmcat [Wed, 19 Nov 2008 17:09:28 +0000 (17:09 +0000)]
local-build-scripts.patch

Add a couple of handy scripts to crossmake and send over dfu

From: warmcat <andy@warmcat.com>

11 years agolocal-add-defconfig.patch
warmcat [Wed, 19 Nov 2008 17:09:28 +0000 (17:09 +0000)]
local-add-defconfig.patch

Adds svn defconfig

From: warmcat <andy@warmcat.com>

11 years agofix-wm8753-DBG.patch
Andy Green [Wed, 19 Nov 2008 17:03:23 +0000 (17:03 +0000)]
fix-wm8753-DBG.patch

Signed-off-by: Andy Green <andy@openmoko.com>
11 years agoglamo-cmdqueue-bandaid.patch
mokopatches [Wed, 19 Nov 2008 17:03:23 +0000 (17:03 +0000)]
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@warmcat.com>

11 years agogta02-sound-bandaid.patch
mokopatches [Wed, 19 Nov 2008 17:03:23 +0000 (17:03 +0000)]
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.

11 years agosuspend-prelim1.patch
mokopatches [Wed, 19 Nov 2008 17:03:22 +0000 (17:03 +0000)]
suspend-prelim1.patch

11 years agogta01-dehang-printk.patch
mokopatches [Wed, 19 Nov 2008 17:03:22 +0000 (17:03 +0000)]
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.

11 years agofix-pcf50633-LOWBAT-kill-init.patch
mokopatches [Wed, 19 Nov 2008 17:03:22 +0000 (17:03 +0000)]
fix-pcf50633-LOWBAT-kill-init.patch

11 years agofix-pcf50606-LOWBAT-kill-init.patch
mokopatches [Wed, 19 Nov 2008 17:03:22 +0000 (17:03 +0000)]
fix-pcf50606-LOWBAT-kill-init.patch

11 years agofix-hwecc-2410.patch
mokopatches [Wed, 19 Nov 2008 17:03:22 +0000 (17:03 +0000)]
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@openmoko.org>
11 years agoatheros_2_0_sdio_stack.patch
mokopatches [Wed, 19 Nov 2008 17:03:22 +0000 (17:03 +0000)]
atheros_2_0_sdio_stack.patch

11 years agoatheros_2_0_hcd.patch
mokopatches [Wed, 19 Nov 2008 17:03:21 +0000 (17:03 +0000)]
atheros_2_0_hcd.patch

11 years agoatheros_2_0_function.patch
mokopatches [Wed, 19 Nov 2008 17:03:20 +0000 (17:03 +0000)]
atheros_2_0_function.patch

11 years agopnp_fixes.patch
mokopatches [Wed, 19 Nov 2008 17:03:19 +0000 (17:03 +0000)]
pnp_fixes.patch

11 years agos3c2410-usb-switch.patch
mokopatches [Wed, 19 Nov 2008 17:03:19 +0000 (17:03 +0000)]
s3c2410-usb-switch.patch

11 years agobq27000-battery-driver.patch
mokopatches [Wed, 19 Nov 2008 17:03:18 +0000 (17:03 +0000)]
bq27000-battery-driver.patch

11 years agofiq-hdq.patch
mokopatches [Wed, 19 Nov 2008 17:03:18 +0000 (17:03 +0000)]
fiq-hdq.patch

11 years agointroduce-fiq-migrate-vibrator-gta02-only.patch
mokopatches [Wed, 19 Nov 2008 17:03:18 +0000 (17:03 +0000)]
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@openmoko.com>
Signed-off-by: Andy Green <andy@openmoko.com>
11 years agointroduce-fiq-use-timer3-as-source.patch
mokopatches [Wed, 19 Nov 2008 17:03:18 +0000 (17:03 +0000)]
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@openmoko.com>
Signed-off-by: Andy Green <andy@openmoko.com>
11 years agointroduce-fiq-basis.patch
mokopatches [Wed, 19 Nov 2008 17:03:18 +0000 (17:03 +0000)]
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@warmcat.com>
11 years agofail-unless-uimage.patch
mokopatches [Wed, 19 Nov 2008 17:03:18 +0000 (17:03 +0000)]
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.

11 years agos3c2410-qt2410-buttons.patch
mokopatches [Wed, 19 Nov 2008 17:03:18 +0000 (17:03 +0000)]
s3c2410-qt2410-buttons.patch

11 years agos3c2440-nand-disable-hwecc.patch
mokopatches [Wed, 19 Nov 2008 17:03:18 +0000 (17:03 +0000)]
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

11 years agoinput-nots-mousedev.patch
mokopatches [Wed, 19 Nov 2008 17:03:17 +0000 (17:03 +0000)]
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@openmoko.org>
11 years agopm-debug_less_verbose.patch
mokopatches [Wed, 19 Nov 2008 17:03:17 +0000 (17:03 +0000)]
pm-debug_less_verbose.patch

11 years agoconfig-nr-tty-devices.patch
mokopatches [Wed, 19 Nov 2008 17:03:17 +0000 (17:03 +0000)]
config-nr-tty-devices.patch

11 years agoopenmoko-logo.patch
mokopatches [Wed, 19 Nov 2008 17:03:17 +0000 (17:03 +0000)]
openmoko-logo.patch

11 years agogta02-bt-fixes.patch
mokopatches [Wed, 19 Nov 2008 17:03:17 +0000 (17:03 +0000)]
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.

11 years agopcf506xx.patch
mokopatches [Wed, 19 Nov 2008 17:03:16 +0000 (17:03 +0000)]
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@openmoko.org>

11 years agogta02-acc.patch
mokopatches [Wed, 19 Nov 2008 17:03:16 +0000 (17:03 +0000)]
gta02-acc.patch

11 years agogta02-leds.patch
mokopatches [Wed, 19 Nov 2008 17:03:16 +0000 (17:03 +0000)]
gta02-leds.patch

11 years agolis302dl.patch
mokopatches [Wed, 19 Nov 2008 17:03:16 +0000 (17:03 +0000)]
lis302dl.patch
This is a Linux driver for the STmicro LIS302DL 3-axis accelerometer.

Signed-off-by: Harald Welte <laforge@openmoko.org>
11 years agogta02-sound.patch
mokopatches [Wed, 19 Nov 2008 17:03:15 +0000 (17:03 +0000)]
gta02-sound.patch

11 years agogta02-power_control.patch
mokopatches [Wed, 19 Nov 2008 17:03:15 +0000 (17:03 +0000)]
gta02-power_control.patch

11 years agogta02-core.patch
mokopatches [Wed, 19 Nov 2008 17:03:15 +0000 (17:03 +0000)]
gta02-core.patch

11 years agoglamo-mmc.patch
mokopatches [Wed, 19 Nov 2008 17:03:14 +0000 (17:03 +0000)]
glamo-mmc.patch

11 years agosmedia-glamo.patch
mokopatches [Wed, 19 Nov 2008 17:03:14 +0000 (17:03 +0000)]
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@openmoko.org>
11 years agopcf50633-suspend-hacks.patch
mokopatches [Wed, 19 Nov 2008 17:03:14 +0000 (17:03 +0000)]
pcf50633-suspend-hacks.patch

11 years agopcf50633.patch
mokopatches [Wed, 19 Nov 2008 17:03:14 +0000 (17:03 +0000)]
pcf50633.patch

11 years agos3c2442b-cpuid.patch
mokopatches [Wed, 19 Nov 2008 17:03:14 +0000 (17:03 +0000)]
s3c2442b-cpuid.patch
Add the Samsung S3C2442B CPU idcode to the samsung s3c24xx platform code
and fix a Kconfig typo related tot the 2442.

11 years agos3c2410_udc-2440_dual_packet-workaround.patch
mokopatches [Wed, 19 Nov 2008 17:03:14 +0000 (17:03 +0000)]
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.

11 years agos3c24xx-nand-largepage.patch
mokopatches [Wed, 19 Nov 2008 17:03:14 +0000 (17:03 +0000)]
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@fluff.org>
11 years agos3c_mci-gta01.patch
mokopatches [Wed, 19 Nov 2008 17:03:13 +0000 (17:03 +0000)]
s3c_mci-gta01.patch

11 years agos3c_mci.patch
mokopatches [Wed, 19 Nov 2008 17:03:13 +0000 (17:03 +0000)]
s3c_mci.patch
This is a MMC/SD driver for the Samsung S3C24xx SD/MMC controller, originally
developed years ago by Thomas Kleffel <tk@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@maintech.de>
Signed-off-by: Harald Welte <laforge@gnumonks.org>
11 years agog_ether-vendor_product.patch
mokopatches [Wed, 19 Nov 2008 17:03:13 +0000 (17:03 +0000)]
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.

11 years agog_ether-highpower.patch
mokopatches [Wed, 19 Nov 2008 17:03:13 +0000 (17:03 +0000)]
g_ether-highpower.patch

11 years agoi2c-permit_invalid_addrs.patch
mokopatches [Wed, 19 Nov 2008 17:03:13 +0000 (17:03 +0000)]
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@openmoko.org>
11 years agos3c2410_ts-gta01.patch
mokopatches [Wed, 19 Nov 2008 17:03:13 +0000 (17:03 +0000)]
s3c2410_ts-gta01.patch

11 years agos3c2410_touchscreen.patch
mokopatches [Wed, 19 Nov 2008 17:03:13 +0000 (17:03 +0000)]
s3c2410_touchscreen.patch

11 years agogta01-backlight.patch
mokopatches [Wed, 19 Nov 2008 17:03:12 +0000 (17:03 +0000)]
gta01-backlight.patch
This is a backlight driver for the FIC/OpenMoko Neo1973 GTA01 GSM Phone

Signed-off-by: Harald Welte <laforge@openmoko.org>
11 years agogta01-vibrator.patch
mokopatches [Wed, 19 Nov 2008 17:03:12 +0000 (17:03 +0000)]
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@openmoko.org>
11 years agos3c2410-pwm.patch
mokopatches [Wed, 19 Nov 2008 17:03:12 +0000 (17:03 +0000)]
s3c2410-pwm.patch
This patch adds a PWM api abstraction for the S3C2410 SoC

Signed-off-by: Javi Roman <javiroman@kernel-labs.org>
Signed-off-by: Harald Welte <laforge@openmoko.org>
11 years agogta01-power_control.patch
mokopatches [Wed, 19 Nov 2008 17:03:10 +0000 (17:03 +0000)]
gta01-power_control.patch
[PATCH] Neo1973 GPS / GSM / Bluetooth power control via sysfs

Signed-off-by: Harald Welte <laforge@openmoko.org>
11 years agogta01-inputdevice.patch
mokopatches [Wed, 19 Nov 2008 17:03:10 +0000 (17:03 +0000)]
gta01-inputdevice.patch
This provides support for the GTA01 keyboard

Signed-off-by: Harald Welte <laforge@openmoko.org>
11 years agogta01-jbt6k74.patch
mokopatches [Wed, 19 Nov 2008 17:03:10 +0000 (17:03 +0000)]
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@openmoko.org>
11 years agogta01-core.patch
mokopatches [Wed, 19 Nov 2008 17:03:10 +0000 (17:03 +0000)]
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@openmoko.org>
11 years agogta01-pcf50606.patch
mokopatches [Wed, 19 Nov 2008 17:03:09 +0000 (17:03 +0000)]
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@openmoko.org>
11 years agos3c2410-bbt.patch
mokopatches [Wed, 19 Nov 2008 17:03:09 +0000 (17:03 +0000)]
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@openmoko.org>
11 years agoresume-timers-wq.patch
mokopatches [Wed, 19 Nov 2008 17:03:09 +0000 (17:03 +0000)]
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.

11 years agofix-i2c-s3c2410-resume-race.patch
mokopatches [Wed, 19 Nov 2008 17:03:09 +0000 (17:03 +0000)]
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@openmoko.com>
11 years agogta01-no_nand_partitions.patch
mokopatches [Wed, 19 Nov 2008 17:03:09 +0000 (17:03 +0000)]
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@openmoko.org>
Acked-byt: Ben Dooks <ben-linux@fluff.org>

11 years agoexplicitly-link-notes-section.patch
mokopatches [Wed, 19 Nov 2008 17:03:09 +0000 (17:03 +0000)]
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.

11 years agoMerge branch 's3c64xx-drivers' into s3c64xx
Ben Dooks [Wed, 19 Nov 2008 16:05:39 +0000 (16:05 +0000)]
Merge branch 's3c64xx-drivers' into s3c64xx

11 years agoMerge branch 'rmk-next' into s3c64xx
Ben Dooks [Wed, 19 Nov 2008 15:54:50 +0000 (15:54 +0000)]
Merge branch 'rmk-next' into s3c64xx

11 years agoFB: Samsung SoC framebuffer driver.
Ben Dooks [Wed, 19 Nov 2008 15:44:05 +0000 (15:44 +0000)]
FB: Samsung SoC framebuffer driver.

Support for the newer framebuffer hardware in the
Samsung SoC line of systems, such as the S3C2443,
S3C2450, S3C2416 and the S3C64XX series.

This driver does not have any support yet for the
alpha-blending or chroma-key for mixing the window
output together.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
11 years agoLCD: fix oops if driver only interested in .set_power
Ben Dooks [Wed, 19 Nov 2008 15:44:02 +0000 (15:44 +0000)]
LCD: fix oops if driver only interested in .set_power

The LCD driver core calls LCD drivers when either the blanking state
or the display mode has changed, but does not make any check to see
if the called driver has a .set_mode method.

This means if a driver only has a .set_power method then the system
will OOPS on changing mode (and with the console semaphore held so
you cannot easily see the problem).

Fix the problem by ensuring that either callback is valid before use.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
11 years ago[ARM] SMDK6410: Add LCD (LCD48WVGA) definitions
Ben Dooks [Wed, 19 Nov 2008 15:41:34 +0000 (15:41 +0000)]
[ARM] SMDK6410: Add LCD (LCD48WVGA) definitions

Add support for the LCD 48WVGA module attached to the
SMDK6410.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
11 years ago[ARM] S3C64XX: Add standard S3C64XX 24BPP LCD GPIO setup
Ben Dooks [Wed, 19 Nov 2008 15:41:33 +0000 (15:41 +0000)]
[ARM] S3C64XX: Add standard S3C64XX 24BPP LCD GPIO setup

Add a standard helper to configure the LCD output pins for a 24BPP
display with VSYNC/HSYNC/VDEN.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
11 years ago[ARM] S3C: Add new FB device definition
Ben Dooks [Wed, 19 Nov 2008 15:41:31 +0000 (15:41 +0000)]
[ARM] S3C: Add new FB device definition

Add a device definition for the new S3C framebuffer
driver.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
11 years ago[ARM] S3C: Add register defines for new style framebuffer
Ben Dooks [Wed, 19 Nov 2008 15:41:30 +0000 (15:41 +0000)]
[ARM] S3C: Add register defines for new style framebuffer

Provide  the initial register definitions for the newer
style of framebuffer cores found in the Samsung SoCs
such as S3C2450, S3C64XX.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
11 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
Ben Dooks [Mon, 10 Nov 2008 10:16:17 +0000 (10:16 +0000)]
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6 into rmk-next

11 years agoLinux 2.6.28-rc4
Linus Torvalds [Mon, 10 Nov 2008 00:36:15 +0000 (16:36 -0800)]
Linux 2.6.28-rc4

11 years agoregression: disable timer peek-ahead for 2.6.28
Arjan van de Ven [Sun, 9 Nov 2008 20:45:10 +0000 (12:45 -0800)]
regression: disable timer peek-ahead for 2.6.28

It's showing up as regressions; disabling it very likely just papers
over an underlying issue, but time is running out for 2.6.28, lets get
back to this for 2.6.29

Fixes: #11826 and #11893

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agoMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild...
Linus Torvalds [Mon, 10 Nov 2008 00:20:49 +0000 (16:20 -0800)]
Merge branch 'master' of git://git./linux/kernel/git/sam/kbuild-fixes

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  kbuild: Fixup deb-pkg target to generate separate firmware deb

11 years agokbuild: Fixup deb-pkg target to generate separate firmware deb
Jonathan McDowell [Sat, 13 Sep 2008 16:08:31 +0000 (17:08 +0100)]
kbuild: Fixup deb-pkg target to generate separate firmware deb

The below is a simplistic fix for "make deb-pkg"; it splits the
firmware out to a linux-firmware-image package and adds an
(unversioned) Suggests to the linux package for this firmware.

Signed-Off-By: Jonathan McDowell <noodles@earth.li>
Acked-by: Frans Pop <elendil@planet.nl>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
11 years agoDon't ask twice about not including staging drivers
Linus Torvalds [Sun, 9 Nov 2008 20:47:04 +0000 (12:47 -0800)]
Don't ask twice about not including staging drivers

The "Exclude staging drivers" question is there so that we don't build
staging drivers for allyesconfig or allnoconfig settings, but it's very
irritating when you've already said "no" to staging drivers earlier.

There is absolutely no point in declining twice - once you've declined
the staging drivers, you're done.

So make the second question depend on the first question having been
answered in the affirmative.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agoMerge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux
Linus Torvalds [Sun, 9 Nov 2008 20:25:44 +0000 (12:25 -0800)]
Merge branch 'for-2.6.28' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.28' of git://linux-nfs.org/~bfields/linux:
  Fix nfsd truncation of readdir results

11 years agoMerge branch 'cpus4096' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...
Linus Torvalds [Sun, 9 Nov 2008 20:20:56 +0000 (12:20 -0800)]
Merge branch 'cpus4096' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'cpus4096' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  cpumask: introduce new API, without changing anything, v3
  cpumask: new API, v2
  cpumask: introduce new API, without changing anything

11 years agoFix nfsd truncation of readdir results
Doug Nazar [Wed, 5 Nov 2008 11:16:28 +0000 (06:16 -0500)]
Fix nfsd truncation of readdir results

Commit 8d7c4203 "nfsd: fix failure to set eof in readdir in some
situations" introduced a bug: on a directory in an exported ext3
filesystem with dir_index unset, a READDIR will only return about 250
entries, even if the directory was larger.

Bisected it back to this commit; reverting it fixes the problem.

It turns out that in this case ext3 reads a block at a time, then
returns from readdir, which means we can end up with buf.full==0 but
with more entries in the directory still to be read.  Before 8d7c4203
(but after c002a6c797 "Optimise NFS readdir hack slightly"), this would
cause us to return the READDIR result immediately, but with the eof bit
unset.  That could cause a performance regression (because the client
would need more roundtrips to the server to read the whole directory),
but no loss in correctness, since the cleared eof bit caused the client
to send another readdir.  After 8d7c4203, the setting of the eof bit
made this a correctness problem.

So, move nfserr_eof into the loop and remove the buf.full check so that
we loop until buf.used==0.  The following seems to do the right thing
and reduces the network traffic since we don't return a READDIR result
until the buffer is full.

Tested on an empty directory & large directory; eof is properly sent and
there are no more short buffers.

Signed-off-by: Doug Nazar <nazard@dragoninc.ca>
Cc: David Woodhouse <David.Woodhouse@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
11 years agocpumask: introduce new API, without changing anything, v3
Rusty Russell [Sat, 8 Nov 2008 09:24:19 +0000 (20:24 +1100)]
cpumask: introduce new API, without changing anything, v3

Impact: cleanup

Clean up based on feedback from Andrew Morton and others:

 - change to inline functions instead of macros
 - add __init to bootmem method
 - add a missing debug check

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
11 years agonet: unix: fix inflight counting bug in garbage collector
Miklos Szeredi [Sun, 9 Nov 2008 14:23:57 +0000 (15:23 +0100)]
net: unix: fix inflight counting bug in garbage collector

Previously I assumed that the receive queues of candidates don't
change during the GC.  This is only half true, nothing can be received
from the queues (see comment in unix_gc()), but buffers could be added
through the other half of the socket pair, which may still have file
descriptors referring to it.

This can result in inc_inflight_move_tail() erronously increasing the
"inflight" counter for a unix socket for which dec_inflight() wasn't
previously called.  This in turn can trigger the "BUG_ON(total_refs <
inflight_refs)" in a later garbage collection run.

Fix this by only manipulating the "inflight" counter for sockets which
are candidates themselves.  Duplicating the file references in
unix_attach_fds() is also needed to prevent a socket becoming a
candidate for GC while the skb that contains it is not yet queued.

Reported-by: Andrea Bittau <a.bittau@cs.ucl.ac.uk>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
CC: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agoclarify usage expectations for cnt32_to_63()
Nicolas Pitre [Sun, 9 Nov 2008 05:27:53 +0000 (00:27 -0500)]
clarify usage expectations for cnt32_to_63()

Currently, all existing users of cnt32_to_63() are fine since the CPU
architectures where it is used don't do read access reordering, and user
mode preemption is disabled already.  It is nevertheless a good idea to
better elaborate usage requirements wrt preemption, and use an explicit
memory barrier on SMP to avoid different CPUs accessing the counter
value in the wrong order.  On UP a simple compiler barrier is
sufficient.

Signed-off-by: Nicolas Pitre <nico@marvell.com>
Acked-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc
Linus Torvalds [Sun, 9 Nov 2008 19:14:16 +0000 (11:14 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/drzeus/mmc

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  mmc: struct device - replace bus_id with dev_name(), dev_set_name()
  mmc: increase SD write timeout for crappy cards

11 years agoregulator: Use menuconfig in Kconfig
Takashi Iwai [Thu, 30 Oct 2008 14:57:05 +0000 (15:57 +0100)]
regulator: Use menuconfig in Kconfig

Use menuconfig instead of flat configs so that you can disable/enable
regulator items with one selection.  Also, use depends instead of
reverse selections to make life easier, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
11 years agommc: struct device - replace bus_id with dev_name(), dev_set_name()
Kay Sievers [Sat, 8 Nov 2008 20:37:46 +0000 (21:37 +0100)]
mmc: struct device - replace bus_id with dev_name(), dev_set_name()

Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-Off-By: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
11 years agommc: increase SD write timeout for crappy cards
Pierre Ossman [Sun, 26 Oct 2008 11:37:25 +0000 (12:37 +0100)]
mmc: increase SD write timeout for crappy cards

It seems that some cards are slightly out of spec and occasionally
will not be able to complete a write in the alloted 250 ms [1].
Incease the timeout slightly to allow even these cards to function
properly.

[1] http://lkml.org/lkml/2008/9/23/390

Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
11 years agoMerge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Sat, 8 Nov 2008 18:24:28 +0000 (10:24 -0800)]
Merge branch 'sched-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: optimize sched_clock() a bit
  sched: improve sched_clock() performance

11 years agoMerge branch 'oprofile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Sat, 8 Nov 2008 18:22:38 +0000 (10:22 -0800)]
Merge branch 'oprofile-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'oprofile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  oprofile: Fix p6 counter overflow check
  Cell OProfile: Incorrect local array size in activate spu profiling function
  Revert "Cell OProfile: Incorrect local array size in activate spu profiling function"
  oprofile: fix memory ordering
  Cell OProfile: Incorrect local array size in activate spu profiling function
  Change UTF8 chars in Kconfig help text about Oprofile AMD barcelona

11 years agoMerge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
Linus Torvalds [Sat, 8 Nov 2008 18:22:00 +0000 (10:22 -0800)]
Merge git://git./linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: make usbip depend on CONFIG_NET
  Staging: only build the tree if we really want to

11 years agoFix __pfn_to_page(pfn) for CONFIG_DISCONTIGMEM=y
Rafael J. Wysocki [Sat, 8 Nov 2008 12:53:33 +0000 (13:53 +0100)]
Fix __pfn_to_page(pfn) for CONFIG_DISCONTIGMEM=y

Fix the __pfn_to_page(pfn) macro so that it doesn't evaluate its
argument twice in the CONFIG_DISCONTIGMEM=y case, because 'pfn' may
be a result of a funtion call having side effects.

For example, the hibernation code applies pfn_to_page(pfn) to the
result of a function returning the pfn corresponding to the next set
bit in a bitmap and the current bit position is modified on each
call.  This leads to "interesting" failures for CONFIG_DISCONTIGMEM=y
due to the current behavior of __pfn_to_page(pfn).

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
11 years agosched: optimize sched_clock() a bit
Ingo Molnar [Sat, 8 Nov 2008 16:05:38 +0000 (17:05 +0100)]
sched: optimize sched_clock() a bit

sched_clock() uses cycles_2_ns() needlessly - which is an irq-disabling
variant of __cycles_2_ns().

Most of the time sched_clock() is called with irqs disabled already.
The few places that call it with irqs enabled need to be updated.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
11 years agosched: improve sched_clock() performance
Ingo Molnar [Sat, 8 Nov 2008 15:19:55 +0000 (16:19 +0100)]
sched: improve sched_clock() performance

in scheduler-intense workloads native_read_tsc() overhead accounts for
20% of the system overhead:

 659567 system_call                              41222.9375
 686796 schedule                                 435.7843
 718382 __switch_to                              665.1685
 823875 switch_mm                                4526.7857
 1883122 native_read_tsc                          55385.9412
 9761990 total                                      2.8468

this is large part due to the rdtsc_barrier() that is done before
and after reading the TSC.

But sched_clock() is not a precise clock in the GTOD sense, using such
barriers is completely pointless. So remove the barriers and only use
them in vget_cycles().

This improves lat_ctx performance by about 5%.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
11 years agoStaging: make usbip depend on CONFIG_NET
Greg Kroah-Hartman [Wed, 29 Oct 2008 17:44:55 +0000 (10:44 -0700)]
Staging: make usbip depend on CONFIG_NET

Thanks to Randy Dunlap for finding this problem.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
11 years agoStaging: only build the tree if we really want to
Greg Kroah-Hartman [Sat, 8 Nov 2008 05:12:17 +0000 (21:12 -0800)]
Staging: only build the tree if we really want to

This Kconfig change allows the common 'make allmodconfig' and
'make allyesconfig' build options to skip the staging tree, which is
probably what you want to have happen anyway.

This makes the linux-next developer's life a lot easier so he doesn't
have to worry about changes that break the staging tree, that's for me
to worry about...

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
11 years agoMerge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git...
Ingo Molnar [Fri, 7 Nov 2008 18:22:10 +0000 (19:22 +0100)]
Merge branch 'oprofile-for-tip' of git://git./linux/kernel/git/rric/oprofile into x86/urgent

11 years agoMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Linus Torvalds [Fri, 7 Nov 2008 18:09:28 +0000 (10:09 -0800)]
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Reserve elfcorehdr memory in CONFIG_CRASH_DUMP
  [IA64] fix boot panic caused by offline CPUs
  [IA64] reorder Kconfig options to match x86
  [IA64] Build VT-D iommu support into generic kernel
  [IA64] remove dead BIO_VMERGE_BOUNDARY definition
  [IA64] remove duplicated #include from pci-dma.c
  [IA64] use common header for software IO/TLB
  [IA64] fix the difference between node_mem_map and node_start_pfn
  [IA64] Add error_recovery_info field to SAL section header
  [IA64] Add UV watchlist support.
  [IA64] Simplify SGI uv vs. sn2 driver issues

11 years ago[IA64] Reserve elfcorehdr memory in CONFIG_CRASH_DUMP
Jay Lan [Fri, 7 Nov 2008 17:51:55 +0000 (09:51 -0800)]
[IA64] Reserve elfcorehdr memory in CONFIG_CRASH_DUMP

IA64 kdump kernel failed to initialize /proc/vmcore in 2.6.28-rc2.
A bug was introduced in this patch commit:

  d9a9855d0b06ca6d6cc92596fedcc03f8512e062
  always reserve elfcore header memory in crash kernel

The problem was that the call to reserve_elfcorehdr() should be placed
in CONFIG_CRASH_DUMP rather than in CONFIG_CRASH_KERNEL, which does
not exist.

Signed-off-by: Jay Lan <jlan@sgi.com>
Acked-by: Simon Hormon <horms@verge.net.au>
Signed-off-by: Tony Luck <tony.luck@intel.com>
11 years agoMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
Linus Torvalds [Fri, 7 Nov 2008 17:18:14 +0000 (09:18 -0800)]
Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/pci-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI: fix range check on mmapped sysfs resource files
  PCI: remove excess kernel-doc notation
  PCI: annotate return value of pci_ioremap_bar with __iomem
  PCI: fix VPD limit quirk for Broadcom 5708S

11 years agoMerge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
Linus Torvalds [Fri, 7 Nov 2008 17:17:59 +0000 (09:17 -0800)]
Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, xen: fix use of pgd_page now that it really does return a page

11 years agoMerge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
Linus Torvalds [Fri, 7 Nov 2008 17:17:46 +0000 (09:17 -0800)]
Merge branch 'sched-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: fine-tune SD_SIBLING_INIT
  sched: fine-tune SD_MC_INIT
  sched: fix memory leak in a failure path
  sched: fix a bug in sched domain degenerate