linux-flexiantxendom0-natty.git
13 years agoALSA: hda - Fix SPDIF out regression on ALC889
Takashi Iwai [Wed, 23 Mar 2011 21:54:32 +0000 (22:54 +0100)]
ALSA: hda - Fix SPDIF out regression on ALC889

BugLink: http://bugs.launchpad.net/bugs/761134

commit 20b67dddcc5f29d3d0c900225d85e0ac655bc69d upstream.

The commit 5a8cfb4e8ae317d283f84122ed20faa069c5e0c4
    ALSA: hda - Use ALC_INIT_DEFAULT for really default initialization
changed to use the default initialization method for ALC889, but
this caused a regression on SPDIF output on some machines.
This seems due to the COEF setup included in the default init procedure.
For making SPDIF working again, the COEF-setup has to be avoided for
the id 0889.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=24342
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: SAUCE: kvm: fix push of wrong eip when doing softint
Serge E. Hallyn [Wed, 13 Apr 2011 15:28:20 +0000 (16:28 +0100)]
UBUNTU: SAUCE: kvm: fix push of wrong eip when doing softint

When doing a soft int, we need to bump eip before pushing it to
the stack.  Otherwise we'll do the int a second time.

[apw@canonical.com: merged eip update as per Jan's recommendation.]
BugLink: http://bugs.launchpad.net/bugs/747090
Signed-off-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: Bump ABI
Brad Figg [Wed, 27 Apr 2011 18:36:45 +0000 (11:36 -0700)]
UBUNTU: Bump ABI

Ignore: yes
Signed-off-by: Brad Figg <brad.figg@canonical.com>

13 years agoUBUNTU: Start new release
Brad Figg [Wed, 27 Apr 2011 18:24:05 +0000 (11:24 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Brad Figg <brad.figg@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.38-8.42
Leann Ogasawara [Fri, 8 Apr 2011 19:37:14 +0000 (12:37 -0700)]
UBUNTU: Ubuntu-2.6.38-8.42

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: SAUCE: Revert "Bluetooth: Add new PID for Atheros 3011"
Gustavo F. Padovan [Fri, 8 Apr 2011 19:22:09 +0000 (16:22 -0300)]
UBUNTU: SAUCE: Revert "Bluetooth: Add new PID for Atheros 3011"

This reverts commit be93112accb42c5586a459683d71975cc70673ca.

Bug https://bugzilla.kernel.org/show_bug.cgi?id=27402 reported that some
devices are not working after this commit, so as I don't have the hardware
I'll revert it until a solution comes.

Conflicts:

drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c

Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
BugLink: http://bugs.launchpad.net/bugs/720949
cherry-picked from git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6.git
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: [Config] Make linux-libc-dev coinstallable under multiarch
Steve Langasek [Fri, 8 Apr 2011 19:10:34 +0000 (12:10 -0700)]
UBUNTU: [Config] Make linux-libc-dev coinstallable under multiarch

BugLink: http://bugs.launchpad.net/bugs/750585

Signed-off-by: Steve Langasek <slangasek@ubuntu.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: [Config] Disable CONFIG_RTS_PSTOR for armel, powerpc
Leann Ogasawara [Tue, 5 Apr 2011 17:59:08 +0000 (10:59 -0700)]
UBUNTU: [Config] Disable CONFIG_RTS_PSTOR for armel, powerpc

Results in multiple build failures on arm and powerpc:

error: implicit declaration of function 'vmalloc'
error: #error only <linux/bitops.h> can be included directly
error: implicit declaration of function 'BIT_MASK'
error: implicit declaration of function 'BIT_WORD'
etc...

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agox86, hibernate: Initialize mmu_cr4_features during boot
H. Peter Anvin [Thu, 7 Apr 2011 21:15:48 +0000 (18:15 -0300)]
x86, hibernate: Initialize mmu_cr4_features during boot

Restore the initialization of mmu_cr4_features during boot, which was
removed without comment in checkin e5f15b45ddf3afa2bbbb10c7ea34fb32b6de0a0e

x86: Cleanup highmap after brk is concluded

thereby breaking resume from hibernate.  This restores previous
functionality in approximately the same place, and corrects the
reading of %cr4 on pre-CPUID hardware (%cr4 exists if and only if
CPUID is supported.)

However, part of the problem is that the hibernate suspend/resume
sequence should manage the save/restore of %cr4 explicitly.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <201104020154.57136.rjw@sisk.pl>
(cherry picked from commit 4da9484bdece39ab0b098fa711e095e3e9fc8684)
Tested-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
BugLink: http://bugs.launchpad.net/bugs/752870
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agostaging: rts_pstor: set lun_mode in a different place
wwang [Tue, 15 Mar 2011 08:22:16 +0000 (16:22 +0800)]
staging: rts_pstor: set lun_mode in a different place

BugLink: http://bugs.launchpad.net/bugs/698006

In sony notebook, card reader will be configured as two-lun mode
through EFUSE. In this situation, MS card can't be recognized
properly because driver does only support single-lun mode in default.
In this patch, lun_mode is set in a different place, so driver can
detect the EFUSE configuation automatically.

Signed-off-by: wwang <wei_wang@realsil.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agostaging: rts_pstor: modify initial card clock
wwang [Tue, 15 Mar 2011 08:22:06 +0000 (16:22 +0800)]
staging: rts_pstor: modify initial card clock

BugLink: http://bugs.launchpad.net/bugs/698006

Modify initial card clock to avoid over spec

Signed-off-by: wwang <wei_wang@realsil.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: AppArmor: Fix masking of capabilities in complain mode
John Johansen [Thu, 7 Apr 2011 17:41:58 +0000 (10:41 -0700)]
UBUNTU: AppArmor: Fix masking of capabilities in complain mode

BugLink: http://bugs.launchpad.net/bugs/748656

AppArmor is masking the capabilities returned by capget against the
capabilities mask in the profile.  This is wrong, in complain mode the
profile has effectively all capabilities, as the profile restrictions are
not being enforced, merely tested against to determine is an access is
known by the profile.

This can result in the wrong behavior of security conscience applications
like sshd which examine their capability set, and change their behavior
accordingly.  In this case because of the masked capability set being
returned sshd fails due to DAC checks, even when the profile is complain
mode.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoRevert "tcp: disallow bind() to reuse addr/port"
Leann Ogasawara [Thu, 7 Apr 2011 13:50:51 +0000 (06:50 -0700)]
Revert "tcp: disallow bind() to reuse addr/port"

BugLink: http://bugs.launchpad.net/bugs/731878

http://marc.info/?t=130176746300003&r=1&w=2

This reverts commit c191a836a908d1dd6b40c503741f91b914de3348.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agostaging: rts_pstor: MSXC card power class
wwang [Tue, 8 Mar 2011 07:22:14 +0000 (15:22 +0800)]
staging: rts_pstor: MSXC card power class

BugLink: http://bugs.launchpad.net/bugs/698006

1, Initialize chip->ms_power_class_en in rtsx_init_options;
2, In reset_ms_pro, set different initial value of change_power_class
according to chip->ms_power_class_en.

Signed-off-by: wwang <wei_wang@realsil.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 9fe341e834bec1cad92c3f320931d0563674e112)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agostaging: rts_pstor: optimize kmalloc to kzalloc
Alexander Beregalov [Wed, 9 Mar 2011 00:53:38 +0000 (03:53 +0300)]
staging: rts_pstor: optimize kmalloc to kzalloc

BugLink: http://bugs.launchpad.net/bugs/698006

Use kzalloc rather than kmalloc followed by memset with 0.
Found by coccinelle.

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 1840c15b0a504fed6ee08b475245a964336b76e6)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agostaging: rts_pstor: fix a bug that a greenhouse sd card can't be recognized
wwang [Fri, 4 Mar 2011 02:56:36 +0000 (10:56 +0800)]
staging: rts_pstor: fix a bug that a greenhouse sd card can't be recognized

BugLink: http://bugs.launchpad.net/bugs/698006

A greenhouse sd card can't be recognized using rts5209.
To fix this bug, these modifications are applied:
1, Move some codes which clear sd internal variables from sd_init_type to
sd_prepare_reset. So sd_init_type is useless any more and is removed
entirely;
2, If a sd card can't pass sd3.0 mode, the action of tunning phase should be
avoided when retrying sd2.0 mode.

Signed-off-by: wwang <wei_wang@realsil.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 2d2322b269c2524996a259024f82c7e318719696)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agostaging: rts_pstor: fix sparse warning
wwang [Wed, 16 Feb 2011 07:56:11 +0000 (15:56 +0800)]
staging: rts_pstor: fix sparse warning

BugLink: http://bugs.launchpad.net/bugs/698006

Add static modifier before some functions and global variables.

Signed-off-by: wwang <wei_wang@realsil.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 6680d2cab316a0c0e4cea0727e6d63426a77bb12)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agostaging: rts_pstor: delete a function
wwang [Wed, 16 Feb 2011 07:56:10 +0000 (15:56 +0800)]
staging: rts_pstor: delete a function

BugLink: http://bugs.launchpad.net/bugs/698006

Delete a function named rtsx_transfer_sglist which won't be called.

Signed-off-by: wwang <wei_wang@realsil.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 7eb90a3682fc42c5607cff931e5d0f6a9d52dc03)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoStaging: rts_pstor: fix read past end of buffer
Dan Carpenter [Wed, 9 Feb 2011 09:40:12 +0000 (12:40 +0300)]
Staging: rts_pstor: fix read past end of buffer

BugLink: http://bugs.launchpad.net/bugs/698006

We read one space past the end of the buffer because we add 1.

Also I changed it to use ARRAY_SIZE() instead of manually calculating
the size.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 7e79f78b331632c1812ce9c07443550aa2b6c0fe)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agostaging: rts_pstor: potential NULL dereference
Vasiliy Kulikov [Wed, 2 Feb 2011 18:29:31 +0000 (21:29 +0300)]
staging: rts_pstor: potential NULL dereference

BugLink: http://bugs.launchpad.net/bugs/698006

pci_get_bus_and_slot() may return NULL, but the caller checks
wrong variable.

Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 37af07d19a53924a70ae42faebf968c04a631c8c)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoStaging: rts_pstor: fixed some brace code styling issues
Timo von Holtz [Tue, 1 Feb 2011 18:28:46 +0000 (19:28 +0100)]
Staging: rts_pstor: fixed some brace code styling issues

BugLink: http://bugs.launchpad.net/bugs/698006

Fixed all brace coding style issues in the following files:
drivers/staging/rts_pstor/rtsx_card.h
drivers/staging/rts_pstor/spi.c
drivers/staging/rts_pstor/trace.h
drivers/staging/rts_pstor/xd.c

Signed-off-by: Timo von Holtz <tvh@informatik.uni-kiel.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 0838b87cae7e81e497218b5eba3c8e9ca6f3ddbe)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agostaging: fix rts_pstor build errors
Randy Dunlap [Mon, 31 Jan 2011 21:11:28 +0000 (13:11 -0800)]
staging: fix rts_pstor build errors

BugLink: http://bugs.launchpad.net/bugs/698006

Fix multiple rts_pstor build errors.

When CONFIG_PCI is not enabled:

drivers/staging/rts_pstor/rtsx.c: In function 'rtsx_acquire_irq':
drivers/staging/rts_pstor/rtsx.c:324: error: implicit declaration of function 'pci_intx'
drivers/staging/rts_pstor/rtsx.c: In function 'rtsx_read_pci_cfg_byte':
drivers/staging/rts_pstor/rtsx.c:336: error: implicit declaration of function 'pci_get_domain_bus_and_slot'
drivers/staging/rts_pstor/rtsx.c:336: warning: assignment makes pointer from integer without a cast
drivers/staging/rts_pstor/rtsx.c: In function 'rtsx_shutdown':
drivers/staging/rts_pstor/rtsx.c:462: error: implicit declaration of function 'pci_disable_msi'
drivers/staging/rts_pstor/rtsx.c: In function 'rtsx_probe':
drivers/staging/rts_pstor/rtsx.c:981: error: implicit declaration of function 'pci_enable_msi'

When CONFIG_SCSI is not enabled:

In file included from drivers/staging/rts_pstor/rtsx.h:45,
                 from drivers/staging/rts_pstor/rtsx.c:28:
include/scsi/scsi_cmnd.h:27:25: warning: "BLK_MAX_CDB" is not defined
include/scsi/scsi_cmnd.h:28:3: error: #error MAX_COMMAND_SIZE can not be bigger than BLK_MAX_CDB
In file included from drivers/staging/rts_pstor/rtsx.h:45,
                 from drivers/staging/rts_pstor/rtsx.c:28:
include/scsi/scsi_cmnd.h: In function 'scsi_bidi_cmnd':
include/scsi/scsi_cmnd.h:184: error: implicit declaration of function 'blk_bidi_rq'
include/scsi/scsi_cmnd.h:185: error: dereferencing pointer to incomplete type
include/scsi/scsi_cmnd.h: In function 'scsi_in':
include/scsi/scsi_cmnd.h:191: error: dereferencing pointer to incomplete type
include/scsi/scsi_cmnd.h: In function 'scsi_get_lba':  CC      drivers/gpu/drm/nouveau/nv04_tv.o

include/scsi/scsi_cmnd.h:269: error: implicit declaration of function 'blk_rq_pos'
In file included from drivers/staging/rts_pstor/rtsx.h:48,
                 from drivers/staging/rts_pstor/rtsx.c:28:
include/scsi/scsi_eh.h: At top level:
include/scsi/scsi_eh.h:84: error: 'BLK_MAX_CDB' undeclared here (not in a function)
drivers/staging/rts_pstor/rtsx.c: In function 'slave_configure':
drivers/staging/rts_pstor/rtsx.c:107: error: implicit declaration of function 'blk_queue_dma_alignment'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: wei_wang@realsil.com.cn
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 27a16811ab4dc819eebbd4e7b07d485f6e8f0134)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agostaging: add rts_pstor for Realtek PCIE cardreader
wwang [Fri, 21 Jan 2011 09:39:18 +0000 (17:39 +0800)]
staging: add rts_pstor for Realtek PCIE cardreader

BugLink: http://bugs.launchpad.net/bugs/698006

rts_pstor is used to support Realtek PCI-E card readers,
including rts5209, rts5208, Barossa.

Signed-off-by: wwang <wei_wang@realsil.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
(cherry picked from commit 77d89b08766c878a2594b15d203e513acf952340)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: [Config] CONFIG_RTS_PSTOR=m
Tim Gardner [Wed, 6 Apr 2011 18:55:14 +0000 (12:55 -0600)]
UBUNTU: [Config] CONFIG_RTS_PSTOR=m

BugLink: http://bugs.launchpad.net/bugs/698006

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: SAUCE: (drop after 2.6.39) v4l: make sure drivers supply a zeroed struct...
Herton Ronaldo Krzesinski [Fri, 1 Apr 2011 16:50:29 +0000 (13:50 -0300)]
UBUNTU: SAUCE: (drop after 2.6.39) v4l: make sure drivers supply a zeroed struct v4l2_subdev

Some v4l drivers currently don't initialize their struct v4l2_subdev
with zeros, and this is a problem since some of the v4l2 code expects
this. One example is the addition of internal_ops in commit 45f6f84,
after that we are at risk of random oopses with these drivers when code
in v4l2_device_register_subdev tries to dereference sd->internal_ops->*,
as can be shown by the report at http://bugs.launchpad.net/bugs/745213
and analysis of its crash at https://lkml.org/lkml/2011/4/1/168

Use kzalloc within problematic drivers to ensure we have a zeroed struct
v4l2_subdev.

BugLink: http://bugs.launchpad.net/bugs/745213
Cc: <stable@kernel.org>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agowatchdog: sp5100_tco.c: Check if firmware has set correct value in tcobase.
Yinghai Lu [Thu, 17 Mar 2011 03:01:07 +0000 (20:01 -0700)]
watchdog: sp5100_tco.c: Check if firmware has set correct value in tcobase.

Stefano found SP5100 TCO watchdog driver using wrong address.

[    9.148536] SP5100 TCO timer: SP5100 TCO WatchDog Timer Driver v0.01
[    9.148628] DEBUG __ioremap_caller WARNING address=b8fe00 size=8 valid=1 reserved=1

and e820 said that range is RAM.

We should check if we can use that reading out. BIOS could just program wrong address there.

Reported-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by:Yinghai Lu <yinghai@kernel.org>
Acked-by: Mike Waychison <mikew@google.com>
Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Cc: stable <stable@kernel.org>

(cherry picked from commit 90d241edd13bdeef70f264b569f7e150bf23621e)
BugLink: http://bugs.launchpad.net/bugs/740011
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoKVM: SVM: Load %gs earlier if CONFIG_X86_32_LAZY_GS=n
Avi Kivity [Tue, 8 Mar 2011 14:09:51 +0000 (16:09 +0200)]
KVM: SVM: Load %gs earlier if CONFIG_X86_32_LAZY_GS=n

With CONFIG_CC_STACKPROTECTOR, we need a valid %gs at all times, so disable
lazy reload and do an eager reload immediately after the vmexit.

Reported-by: IVAN ANGELOV <ivangotoy@gmail.com>
Acked-By: Joerg Roedel <joerg.roedel@amd.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
(cherry picked from commit 831ca6093ca486060721f5c3c74f97b10f3172b9)
BugLink: http://bugs.launchpad.net/bugs/729085
Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com>

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoInput: sparse-keymap - report KEY_UNKNOWN for unknown scan codes
Seth Forshee [Sun, 27 Mar 2011 05:53:34 +0000 (22:53 -0700)]
Input: sparse-keymap - report KEY_UNKNOWN for unknown scan codes

This allows for debugging non-functional keys easily from
userspace.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
(cherry picked from commit 170531bae648c0ef8d56b44dc5bd8d67717b0db9)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoInput: sparse-keymap - report scancodes with key events
Seth Forshee [Sun, 27 Mar 2011 05:53:34 +0000 (22:53 -0700)]
Input: sparse-keymap - report scancodes with key events

Scancodes are useful debugging aids when incorrect keycodes
are being sent, as is common with laptop hotkeys.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
(cherry picked from commit f3cf5c4fedbe13880cd80a9fa1aebae79ebef20e)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: SAUCE: (drop after 2.6.38) ALSA: HDA: Fix dock mic for Lenovo X220-tablet
David Henningsson [Tue, 5 Apr 2011 05:55:24 +0000 (07:55 +0200)]
UBUNTU: SAUCE: (drop after 2.6.38) ALSA: HDA: Fix dock mic for Lenovo X220-tablet

Without the "thinkpad" quirk, the dock mic in
Lenovo X220 tablet edition won't work.

BugLink: http://bugs.launchpad.net/bugs/751033
Cc: stable@kernel.org
Tested-by: James Ferguson <james.ferguson@canonical.com>
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoALSA: HDA: New AD1984A model for Dell Precision R5500
David Henningsson [Mon, 7 Feb 2011 14:19:34 +0000 (15:19 +0100)]
ALSA: HDA: New AD1984A model for Dell Precision R5500

For codec AD1984A, add a new model to support Dell Precision R5500
or the microphone jack won't work correctly.

BugLink: http://bugs.launchpad.net/bugs/741516
Tested-by: Kent Baxley <kent.baxley@canonical.com>
Cc: stable@kernel.org
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit 677cd904aba939bc4cfdc3c1eada8ec46582127e)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoALSA: HDA: Add dock mic quirk for Lenovo Thinkpad X220
David Henningsson [Thu, 31 Mar 2011 07:36:19 +0000 (09:36 +0200)]
ALSA: HDA: Add dock mic quirk for Lenovo Thinkpad X220

This quirk is needed for the docking station mic of
Lenovo Thinkpad X220 to function correctly.

BugLink: http://bugs.launchpad.net/bugs/746259
Cc: stable@kernel.org
Tested-by: James Ferguson <james.ferguson@canonical.com>
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit 840126579da56edae8ecc4a0d85198f742982f10)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: SAUCE: (drop after 2.6.38) add support for Lenovo tablet ID (0xE6)
Manoj Iyer [Thu, 31 Mar 2011 19:31:13 +0000 (14:31 -0500)]
UBUNTU: SAUCE: (drop after 2.6.38) add support for Lenovo tablet ID (0xE6)

Patch was submitted upstream, upstream has changed the way
resolutions are reported, so I need to rework the upstream
patch based on for-linus tree. Not sure when the upstream
patches will get merged to linus tree. More information here:
https://lkml.org/lkml/2011/3/31/403

BugLink: http://bugs.launchpad.net/bugs/746652

Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: Start new release
Leann Ogasawara [Fri, 8 Apr 2011 16:26:30 +0000 (09:26 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.38-8.41
Leann Ogasawara [Tue, 5 Apr 2011 16:39:06 +0000 (09:39 -0700)]
UBUNTU: Ubuntu-2.6.38-8.41

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoRelax si_code check in rt_sigqueueinfo and rt_tgsigqueueinfo
Roland Dreier [Mon, 28 Mar 2011 21:13:35 +0000 (14:13 -0700)]
Relax si_code check in rt_sigqueueinfo and rt_tgsigqueueinfo

Commit da48524eb206 ("Prevent rt_sigqueueinfo and rt_tgsigqueueinfo
from spoofing the signal code") made the check on si_code too strict.
There are several legitimate places where glibc wants to queue a
negative si_code different from SI_QUEUE:

 - This was first noticed with glibc's aio implementation, which wants
   to queue a signal with si_code SI_ASYNCIO; the current kernel
   causes glibc's tst-aio4 test to fail because rt_sigqueueinfo()
   fails with EPERM.

 - Further examination of the glibc source shows that getaddrinfo_a()
   wants to use SI_ASYNCNL (which the kernel does not even define).
   The timer_create() fallback code wants to queue signals with SI_TIMER.

As suggested by Oleg Nesterov <oleg@redhat.com>, loosen the check to
forbid only the problematic SI_TKILL case.

Reported-by: Klaus Dittrich <kladit@arcor.de>
Acked-by: Julien Tinnes <jln@google.com>
Cc: <stable@kernel.org>
Signed-off-by: Roland Dreier <roland@purestorage.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 243b422af9ea9af4ead07a8ad54c90d4f9b6081a)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoALSA: pcm: fix infinite loop in snd_pcm_update_hw_ptr0()
Kelly Anderson [Fri, 1 Apr 2011 09:58:25 +0000 (11:58 +0200)]
ALSA: pcm: fix infinite loop in snd_pcm_update_hw_ptr0()

When period interrupts are disabled, snd_pcm_update_hw_ptr0() compares
the current time against the time estimated for the current hardware
pointer to detect xruns.  The somewhat fuzzy threshold in the while loop
makes it possible that hdelta becomes negative; the comparison being
done with unsigned types then makes the loop go through the entire 263
negative range, and, depending on the value, never reach an unsigned
value that is small enough to stop the loop.  Doing this with interrupts
disabled results in the machine locking up.

To prevent this, ensure that the loop condition uses signed types for
both operands so that the comparison is correctly done.

Many thanks to Kelly Anderson for debugging this.

Reported-by: Nix <nix@esperi.org.uk>
Reported-by: "Christopher K." <c.krooss@googlemail.com>
Reported-and-tested-by: Kelly Anderson <kelly@silka.with-linux.com>
Signed-off-by: Kelly Anderson <kelly@silka.with-linux.com>
[cl: remove unneeded casts; use a temp variable]
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Cc: 2.6.38 <stable@kernel.org>

Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit 12ff414e2e4512f59fe191dc18e856e2939a1c79)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: [Config] Build some framebuffer drivers as modules for powerpc kernels.
Luke Yelavich [Fri, 1 Apr 2011 12:09:38 +0000 (23:09 +1100)]
UBUNTU: [Config] Build some framebuffer drivers as modules for powerpc kernels.

At some point in the past with config update/consolidation, some framebuffer
drivers got built into the powerpc kernels. This config change builds these
drivers as modules, as the OpenFirmware framebuffer driver is already in the
kernel. This also allows DRM modules to take priority in the case of radeon
cards.

Signed-off-by: Luke Yelavich <themuso@ubuntu.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: [Config] Disable CONFIG_DRM_RADEON_KMS on powerpc kernels
Luke Yelavich [Fri, 1 Apr 2011 12:09:37 +0000 (23:09 +1100)]
UBUNTU: [Config] Disable CONFIG_DRM_RADEON_KMS on powerpc kernels

Radeon KMS on powerpc gives an oops on startup, leaving the user with a blank
screen. Disable KMS for now so that machines with radeon hardware will at
least work in the console/X.

Signed-off-by: Luke Yelavich <themuso@ubuntu.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: [Config] Disable CONFIG_CRASH_DUMP on 32-bit powerpc kernels
Luke Yelavich [Fri, 1 Apr 2011 12:09:35 +0000 (23:09 +1100)]
UBUNTU: [Config] Disable CONFIG_CRASH_DUMP on 32-bit powerpc kernels

BugLink: https://launchpad.net/bugs/745358

With CONFIG_CRASH_DUMP enabled, the 32-bit powerpc kernels are unbootable,
even with the latest yaboot in natty. Disable it for now so we can have
bootable kernels and disk images again.

Signed-off-by: Luke Yelavich <themuso@ubuntu.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: SAUCE: Increase the default hard limit for open FDs to 4096
Tim Gardner [Tue, 29 Mar 2011 23:24:40 +0000 (17:24 -0600)]
UBUNTU: SAUCE: Increase the default hard limit for open FDs to 4096

BugLink: http://bugs.launchpad.net/bugs/663090

This presumes that INR_OPEN is 1024.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: SAUCE: (drop after 2.6.38) eeepc-wmi: Add support for T101MT Home/Express...
Seth Forshee [Thu, 31 Mar 2011 15:00:46 +0000 (10:00 -0500)]
UBUNTU: SAUCE: (drop after 2.6.38) eeepc-wmi: Add support for T101MT Home/Express Gate key

This key is different than other hotkeys, having seperate scan
codes for press, release, and hold, so it requires some special
filtering. Press and release events are passed on, and hold events
are ignored since sparse-keymap does not support hardware
autorepeat. Instead, the input core's software autorepeat is
enabled for the input device.

Note that "Home" in the context of this button doesn't mean the
same thing as the usual Home key, and it really isn't clear at
all what is meant by "Home". The manufacurer's description of the
button indicates that it should launch some sort of touch screen
settings interface on short press and apply a desktop rotation on
long press.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: Start new release
Leann Ogasawara [Tue, 5 Apr 2011 16:27:04 +0000 (09:27 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.38-8.40
Leann Ogasawara [Thu, 31 Mar 2011 15:59:02 +0000 (08:59 -0700)]
UBUNTU: Ubuntu-2.6.38-8.40

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: SAUCE: nx-emu: further clarify dmesg reporting
Kees Cook [Wed, 30 Mar 2011 22:06:32 +0000 (15:06 -0700)]
UBUNTU: SAUCE: nx-emu: further clarify dmesg reporting

When booting a 32bit non-PAE kernel on a CPU that supports hardware NX,
dmesg did not indicate that NX emulation was being used. This changes
the dmesg reporting to be more clear. Warnings about lacking hardware
NX remain, and the state of NX-emulation is reported when enabled.

BugLink: https://launchpad.net/bugs/745181

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: SAUCE: thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.
Manoj Iyer [Tue, 29 Mar 2011 20:21:26 +0000 (15:21 -0500)]
UBUNTU: SAUCE: thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.

This patch was submitted upstream and acked by maintainer but not yet in
linus tree.

Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>

BugLink: http://launchpad.net/bugs/745217
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: reorder device ids
Corentin Chary [Sun, 6 Feb 2011 12:28:43 +0000 (13:28 +0100)]
eeepc-wmi: reorder device ids

Each device seems to be in a "group" (devid >> 16 & 0xFF).

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 43815941efb1374c2f71eb1fb0a2814b049030eb)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: add touchpad sysfs file
Corentin Chary [Sun, 6 Feb 2011 12:28:42 +0000 (13:28 +0100)]
eeepc-wmi: add touchpad sysfs file

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 4615bb661352acb7032796185c8c5573e47dfa1d)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: comments keymap to clarify the meaning of some keys
Corentin Chary [Sun, 6 Feb 2011 12:30:48 +0000 (13:30 +0100)]
eeepc-wmi: comments keymap to clarify the meaning of some keys

Found while checking PDF manuals...

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 77ca5b0197138db1260bbbb95ce3fd015dd10437)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: real touchpad led device id is 0x001000012
Corentin Chary [Sun, 6 Feb 2011 12:28:41 +0000 (13:28 +0100)]
eeepc-wmi: real touchpad led device id is 0x001000012

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 8571d75d614702e3e0278c92892012dbf7c2e65b)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: respect wireless_hotplug setting
Corentin Chary [Sun, 6 Feb 2011 12:28:40 +0000 (13:28 +0100)]
eeepc-wmi: respect wireless_hotplug setting

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit c14d4b8ea799515cd44134b8eddd8f789f0b6286)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: support backlight power (bl_power) attribute
Corentin Chary [Sun, 6 Feb 2011 12:28:39 +0000 (13:28 +0100)]
eeepc-wmi: support backlight power (bl_power) attribute

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit b71872650fe967eb0a38aa0d7dcbe9c60d160032)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: set the right key code for 0xe9
Corentin Chary [Sun, 6 Feb 2011 12:28:38 +0000 (13:28 +0100)]
eeepc-wmi: set the right key code for 0xe9

This key should power off the backlight, not the display,
it is also used in acpi/video.c to do the same thing.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 54c799a50f58285f5f6a93d87470cba1847943a3)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: add wimax support
Corentin Chary [Sun, 6 Feb 2011 12:28:37 +0000 (13:28 +0100)]
eeepc-wmi: add wimax support

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 2e9e159d8e18c37d60a7d5040314f579a40f4c63)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: add camera and card reader support
Corentin Chary [Sun, 6 Feb 2011 12:28:36 +0000 (13:28 +0100)]
eeepc-wmi: add camera and card reader support

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 9e1565bc390123d3c74b940ba3466faf196970ec)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: use the presence bit correctly
Corentin Chary [Sun, 6 Feb 2011 12:28:35 +0000 (13:28 +0100)]
eeepc-wmi: use the presence bit correctly

I checked some more DSDT, and it seems that I wasn't
totally right about the meaning of DSTS return value.
Bit 0 is clearly the status of the device, and I discovered
that bit 16 is set when the device is present.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit aafa719dcd0cb0c05bb0690c816b13263c8b36e6)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: reorder defines
Corentin Chary [Sun, 6 Feb 2011 12:28:34 +0000 (13:28 +0100)]
eeepc-wmi: reorder defines

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 33e0e6fed04dc6067562c65e3e6d551dc0eb11fc)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: switch to platform_create_bundle()
Corentin Chary [Sun, 6 Feb 2011 12:28:33 +0000 (13:28 +0100)]
eeepc-wmi: switch to platform_create_bundle()

This allow to remove ~30 lines of code.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit a04ce290bffe6b39edf18bac0fdb302503a53a4e)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: add hibernate/resume callbacks
Corentin Chary [Sun, 6 Feb 2011 12:28:32 +0000 (13:28 +0100)]
eeepc-wmi: add hibernate/resume callbacks

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 0773d7f9f1c0ad5fb86d23ad7e4ef5bfd2f48b5e)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: add an helper using simple return codes
Corentin Chary [Sun, 6 Feb 2011 12:28:31 +0000 (13:28 +0100)]
eeepc-wmi: add an helper using simple return codes

eeepc_wmi_get_devstate returns an acpi_status, so each
call need extra logic to handle the return code. This
patch add a simple getter, returning a boolean (or a
negative error code).

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 5c95638d115f9c6661fff254b3beb14b19f88e41)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: return proper error code in eeepc_rfkill_set()
Corentin Chary [Sun, 6 Feb 2011 12:28:30 +0000 (13:28 +0100)]
eeepc-wmi: return proper error code in eeepc_rfkill_set()

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 7898cf1a3665d22c4d16308f73e981c6464be81b)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: serialize access to wmi method
Corentin Chary [Sun, 6 Feb 2011 12:28:29 +0000 (13:28 +0100)]
eeepc-wmi: serialize access to wmi method

\AMW0.WMBC, which is the main method that we use,
is not reentrant. When wireless hotpluging is enabled,
toggling the status of the wireless device using WMBC will
trigger a notification and the notification handler need to
call WMBC again to get the new status of the device, this
will trigger the following error:

ACPI Error (dswload-0802): [_T_0] Namespace lookup failure, AE_ALREADY_EXISTS
ACPI Exception: AE_ALREADY_EXISTS, During name lookup/catalog (20100428/psloop-231)
ACPI Error (psparse-0537): Method parse/execution failed [\AMW0.WMBC] (Node f7023b88), AE_ALREADY_EXISTS
ACPI: Marking method WMBC as Serialized because of AE_ALREADY_EXISTS error

Since there is currently no way to tell the acpi subsystem to mark
a method as serialized, we do it in eeepc-wmi.

Of course, we could let the first call fail, and then it would work,
but it doesn't seems really clean, and it will make the first
WMBC call return a random value.

This patch was tested on EeePc 1000H with a RaLink RT2860
wireless card using the rt2800pci driver. rt2860sta driver
seems to deadlock when we remove the pci device...

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit 279f8f95493c9aaa0a85520c863ccba87c4bf930)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoeeepc-wmi: add hotplug code for Eeepc 1000H
Corentin Chary [Sun, 6 Feb 2011 12:28:28 +0000 (13:28 +0100)]
eeepc-wmi: add hotplug code for Eeepc 1000H

Implement wireless like hotplug handling (code stolen from eeepc-laptop).

Reminder: on some models rfkill is implemented by logically unplugging the
wireless card from the PCI bus. Despite sending ACPI notifications, this does
not appear to be implemented using standard ACPI hotplug - nor does the
firmware provide the _OSC method required to support native PCIe hotplug.
The only sensible choice appears to be to handle the hotplugging directly in
the platform driver.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
(cherry picked from commit afa7c886578ce264d9b66d4bcb1fea51fac47925)

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: rebase to v2.6.38.2
Leann Ogasawara [Mon, 28 Mar 2011 13:56:15 +0000 (06:56 -0700)]
UBUNTU: rebase to v2.6.38.2

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: [Config] update configs after v2.6.38.1 rebase
Leann Ogasawara [Thu, 24 Mar 2011 15:33:05 +0000 (08:33 -0700)]
UBUNTU: [Config] update configs after v2.6.38.1 rebase

Basically, enable HID_ACRUX=m

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: rebase to v2.6.38.1
Leann Ogasawara [Thu, 24 Mar 2011 15:29:21 +0000 (08:29 -0700)]
UBUNTU: rebase to v2.6.38.1

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: [Config] packaging: adjust perms on vmlinuz as well
Kees Cook [Wed, 23 Mar 2011 20:17:13 +0000 (13:17 -0700)]
UBUNTU: [Config] packaging: adjust perms on vmlinuz as well

Since kernel symbols are resolvable internally to the kernel, the kernel
itself has a map of the symbols. Continuing the tradition of frustrating
off-the-shelf kernel exploits, make vmlinuz unreadable for non-root, just
like has been done for System.map, etc.

Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: SAUCE: HID: ntrig: fix suspend/resume on recent models
Henrik Rydberg [Wed, 23 Mar 2011 14:08:14 +0000 (15:08 +0100)]
UBUNTU: SAUCE: HID: ntrig: fix suspend/resume on recent models

The recent 1b96:0006 model does not come up after suspend, which
seems to be related to the initialization problems reported
upstream. This patch adds a wakeup call via the reset-resume hook,
which fixes the problem.

Tested on older hardware without sign of regressions.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: SAUCE: HID: hid-ntrig: add support for 1b96:0006 model
Henrik Rydberg [Tue, 22 Mar 2011 13:14:00 +0000 (14:14 +0100)]
UBUNTU: SAUCE: HID: hid-ntrig: add support for 1b96:0006 model

This patch adds support for 1b96:0006 with firmware version
1.12.1.41.0.

Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years ago(drop after v2.6.38) HID: hid-ntrig: init settle and mode check
Rafi Rubin [Tue, 22 Mar 2011 13:13:59 +0000 (14:13 +0100)]
(drop after v2.6.38) HID: hid-ntrig: init settle and mode check

Adding a wait before the wakeup signal.

As a precautionary measure sanity check the current sensor mode.  If
needed reset it to "dual".

When the device is responding poorly and needs the wakeup call, it was
missing it.  Giving it a chance to settle first improves the chances
that signal gets through.

Upstream commit 7b2a64c96ad53c4299f7e6ddf8c2f99cb48940a9

Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu>
Tested-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years ago(drop after v2.6.38) HID: ntrig: apply NO_INIT_REPORTS quirk
Rafi Rubin [Tue, 22 Mar 2011 13:13:58 +0000 (14:13 +0100)]
(drop after v2.6.38) HID: ntrig: apply NO_INIT_REPORTS quirk

Probing reports does bad things with some ntrig firmwares, better to
just leave them alone.

Upstream commit 6638dedaec6e3d32654f0ac5786f5d32963e208b

[rydberg@euromail.se: wiggled for natty]
Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years ago(drop after v2.6.38) HID: ntrig don't dereference unclaimed hidinput
Rafi Rubin [Tue, 22 Mar 2011 13:13:57 +0000 (14:13 +0100)]
(drop after v2.6.38) HID: ntrig don't dereference unclaimed hidinput

Check before dereferencing field->hidinput to fix a reported invalid
deference bug.

Upstream commit f41a52d3010579949a3b9fd76783120d9643b60b

Signed-off-by: Rafi Rubin <rafi@seas.upenn.edu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: [Config] Set CONFIG_NR_CPUS=256 for amd64 generic
Brad Figg [Thu, 17 Mar 2011 21:17:18 +0000 (14:17 -0700)]
UBUNTU: [Config] Set CONFIG_NR_CPUS=256 for amd64 generic

BugLink: http://bugs.launchpad.net/bugs/737124

SRU Justification

Impact: Workstations with greater than 64 cores cannot boot.

        See: http://bugs.launchpad.net/bugs/706058 for information
about memory impact.

Signed-off-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: Bump ABI
Tim Gardner [Mon, 21 Mar 2011 15:05:07 +0000 (09:05 -0600)]
UBUNTU: Bump ABI

Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: Start new release
Leann Ogasawara [Mon, 28 Mar 2011 13:25:33 +0000 (06:25 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.38-7.39
Leann Ogasawara [Thu, 24 Mar 2011 17:00:13 +0000 (10:00 -0700)]
UBUNTU: Ubuntu-2.6.38-7.39

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: Start new release
Leann Ogasawara [Thu, 24 Mar 2011 16:57:33 +0000 (09:57 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.38-7.38
Leann Ogasawara [Tue, 22 Mar 2011 13:17:29 +0000 (06:17 -0700)]
UBUNTU: Ubuntu-2.6.38-7.38

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: Start new release
Leann Ogasawara [Tue, 22 Mar 2011 13:14:50 +0000 (06:14 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.38-7.37
Leann Ogasawara [Mon, 21 Mar 2011 13:51:45 +0000 (06:51 -0700)]
UBUNTU: Ubuntu-2.6.38-7.37

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: Start new release
Leann Ogasawara [Sun, 20 Mar 2011 23:06:54 +0000 (16:06 -0700)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.38-7.36
Andy Whitcroft [Fri, 18 Mar 2011 18:18:30 +0000 (18:18 +0000)]
UBUNTU: Ubuntu-2.6.38-7.36

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] switch CONFIG_FB_VESA back to module
Andy Whitcroft [Tue, 8 Mar 2011 22:40:32 +0000 (22:40 +0000)]
UBUNTU: [Config] switch CONFIG_FB_VESA back to module

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoYama: fix default relationship to check thread group
Kees Cook [Fri, 18 Mar 2011 16:51:16 +0000 (09:51 -0700)]
Yama: fix default relationship to check thread group

Yet another case of a thread needing to match against the group leader.

BugLink: http://bugs.launchpad.net/bugs/737676
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: SAUCE: drm/i915: Fix pipelined fencing
Chris Wilson [Thu, 17 Mar 2011 22:12:05 +0000 (22:12 +0000)]
UBUNTU: SAUCE: drm/i915: Fix pipelined fencing

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=34584
Cc: Andy Whitcroft <apw@canonical.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>

[We are expecting this to appear in upstream shortly, but the symptoms
are pretty serious corruption in gnome-terminal and other scrollable
text, and this is well understood and tested.]

BugLink: http://bugs.launchpad.net/bugs/717114
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoRevert "UBUNTU: SAUCE: KLUDGE: work around failed 'shrink-wrap' compiler optimisation"
Andy Whitcroft [Wed, 16 Mar 2011 17:45:19 +0000 (17:45 +0000)]
Revert "UBUNTU: SAUCE: KLUDGE: work around failed 'shrink-wrap' compiler optimisation"

This reverts commit a717f5c8013cb097975295592353c5adcb5253fd.

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Enable common packages for armhf
Loïc Minier [Wed, 16 Mar 2011 00:30:18 +0000 (01:30 +0100)]
UBUNTU: Enable common packages for armhf

Add armhf to Architecture: list of common packages where armel was
already listed, like linux-libc-dev or linux-tools.

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Add initial armhf.mk
Loïc Minier [Wed, 16 Mar 2011 00:30:17 +0000 (01:30 +0100)]
UBUNTU: Add initial armhf.mk

Copy armel.mk for armhf, but disable all flavours for now.

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Add armhf to Debian -> Linux arch map
Loïc Minier [Wed, 16 Mar 2011 00:30:16 +0000 (01:30 +0100)]
UBUNTU: Add armhf to Debian -> Linux arch map

debian/scripts/misc/kernelconfig: add support for armhf to Debian ->
Linux arch map.

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Enforce DEFAULT_MMAP_MIN_ADDR on armhf
Loïc Minier [Wed, 16 Mar 2011 00:30:15 +0000 (01:30 +0100)]
UBUNTU: Enforce DEFAULT_MMAP_MIN_ADDR on armhf

Also enforce CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 on armhf.

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Fix couple of typos in 0-common-vars.mk
Loïc Minier [Wed, 16 Mar 2011 00:30:14 +0000 (01:30 +0100)]
UBUNTU: Fix couple of typos in 0-common-vars.mk

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Support arch= cross-compilation for any arch
Loïc Minier [Wed, 16 Mar 2011 00:30:13 +0000 (01:30 +0100)]
UBUNTU: Support arch= cross-compilation for any arch

Use "dpkg-architecture -a$(arch) -qDEB_HOST_GNU_TYPE" to compute
CROSS_COMPILE when calling debian/rules arch=foo instead of harcoding
support for only armel / arm-linux-gnueabi.

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: purge last vestiges of maverick
Andy Whitcroft [Wed, 16 Mar 2011 14:54:43 +0000 (14:54 +0000)]
UBUNTU: purge last vestiges of maverick

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Include nls_cp437 module in virtual for fat
Loïc Minier [Wed, 16 Mar 2011 00:49:37 +0000 (01:49 +0100)]
UBUNTU: Include nls_cp437 module in virtual for fat

The virtual flavor only ships whitelisted modules including the fat and
vfat modules, but because it doesn't include any codepage modules
(nls_cp*) FAT support is useless.  Include the default codepage
(nls_cp437) in virtual to allow mounting FAT filesystems.

BugLink: http://bugs.launchpad.net/bugs/732046

Signed-off-by: Loïc Minier <loic.minier@linaro.org>
Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

13 years agoUBUNTU: Start new release
Andy Whitcroft [Fri, 18 Mar 2011 16:52:41 +0000 (16:52 +0000)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Ubuntu-2.6.38-7.35
Andy Whitcroft [Tue, 15 Mar 2011 19:04:24 +0000 (19:04 +0000)]
UBUNTU: Ubuntu-2.6.38-7.35

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: rebase to v2.6.38 final
Andy Whitcroft [Tue, 15 Mar 2011 09:03:06 +0000 (09:03 +0000)]
UBUNTU: rebase to v2.6.38 final

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: Bump ABI
Andy Whitcroft [Mon, 14 Mar 2011 21:11:15 +0000 (21:11 +0000)]
UBUNTU: Bump ABI

Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: [Config] disable CONFIG_SCSI_QLA_ISCSI for powerpc 32bit to fix FTBS
Andy Whitcroft [Mon, 14 Mar 2011 18:10:06 +0000 (18:10 +0000)]
UBUNTU: [Config] disable CONFIG_SCSI_QLA_ISCSI for powerpc 32bit to fix FTBS

Signed-off-by: Andy Whitcroft <apw@canonical.com>

13 years agoUBUNTU: rebase fixes bug #715330
Andy Whitcroft [Mon, 14 Mar 2011 15:09:15 +0000 (15:09 +0000)]
UBUNTU: rebase fixes bug #715330

Signed-off-by: Andy Whitcroft <apw@canonical.com>