Tim Gardner [Mon, 1 Nov 2010 17:40:08 +0000 (17:40 +0000)]
UBUNTU: [Config] Clean intermediate directories to make builds repeatable
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Mon, 1 Nov 2010 17:16:50 +0000 (11:16 -0600)]
UBUNTU: [Config] Updated to new firewire module names.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Mon, 1 Nov 2010 16:29:03 +0000 (10:29 -0600)]
UBUNTU: [Config] Drop bnx2 firmware from udeb until the upstream Makefile issue is resolved
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Mon, 1 Nov 2010 14:46:02 +0000 (08:46 -0600)]
UBUNTU: udeb: updated bnx2 firmware file names
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Sat, 30 Oct 2010 19:31:14 +0000 (20:31 +0100)]
UBUNTU: [Config]: CONFIG_SOLO6X10=n for FTBS
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Sat, 30 Oct 2010 16:28:10 +0000 (17:28 +0100)]
UBUNTU: [Config]: CONFIG_ATH6K_LEGACY=n for FTBS
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Wed, 27 Oct 2010 21:10:49 +0000 (15:10 -0600)]
UBUNTU: [Config]: TWL4030_CORE=n
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Sat, 23 Oct 2010 14:40:36 +0000 (08:40 -0600)]
UBUNTU: [Config]: fix changed CONFIG_SYSFS_DEPRECATED_V2 enforcement rules
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Fri, 22 Oct 2010 20:16:25 +0000 (14:16 -0600)]
UBUNTU: [Config]: updateconfigs after rebase to 2.6.37-rc1
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Fri, 22 Oct 2010 20:11:56 +0000 (14:11 -0600)]
UBUNTU: [Config] Note dropped SAUCE patches from 2.6.36 to 2.6.37
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Sat, 23 Oct 2010 14:21:39 +0000 (08:21 -0600)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Andy Whitcroft [Thu, 21 Oct 2010 14:00:53 +0000 (15:00 +0100)]
UBUNTU: Ubuntu-2.6.36-1.7
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 21 Oct 2010 13:47:58 +0000 (14:47 +0100)]
UBUNTU: [Config] update configs following rebase to v2.6.36 final
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 21 Oct 2010 13:40:02 +0000 (14:40 +0100)]
UBUNTU: rebased to v2.6.36 final
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 21 Oct 2010 13:35:21 +0000 (14:35 +0100)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 20 Oct 2010 10:44:47 +0000 (11:44 +0100)]
UBUNTU: Ubuntu-2.6.36-1.6
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 20 Oct 2010 10:41:41 +0000 (11:41 +0100)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 19 Oct 2010 17:58:30 +0000 (18:58 +0100)]
UBUNTU: Ubuntu-2.6.36-1.5
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 30 Sep 2010 12:38:52 +0000 (13:38 +0100)]
UBUNTU: config -- add new config mode 'dumpconfigs'
Add a new configuration mode 'dumpconfigs' which dumps out all of the
configuration questions and their current values. This is consumed by
external scripting to acertain the current options, their types,
and default and current values.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 30 Sep 2010 12:36:30 +0000 (13:36 +0100)]
UBUNTU: config -- simplify the kernelconfig interface
In preparation for adding another kernelconfig interface, simply
the current interface such that the real command is passed through.
This reduces the number and complexity of the make rules while maintaining
a single mapping in kernelconfig.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Sun, 17 Oct 2010 20:24:01 +0000 (21:24 +0100)]
UBUNTU: Bump ABI
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Sun, 17 Oct 2010 20:00:05 +0000 (21:00 +0100)]
UBUNTU: updateportsconfigs following rebase to v2.6.36-rc8
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Sun, 17 Oct 2010 19:58:48 +0000 (20:58 +0100)]
UBUNTU: updateconfigs following rebase to v2.6.36-rc8
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Sun, 17 Oct 2010 19:53:52 +0000 (20:53 +0100)]
UBUNTU: rebase to v2.6.36-rc8
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Sun, 17 Oct 2010 19:51:59 +0000 (20:51 +0100)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Tim Gardner [Wed, 13 Oct 2010 16:10:26 +0000 (10:10 -0600)]
UBUNTU: Simplify the use of CROSS_COMPILER
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Andy Whitcroft [Thu, 14 Oct 2010 12:24:54 +0000 (13:24 +0100)]
UBUNTU: Ubuntu-2.6.36-0.4
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 14 Oct 2010 12:19:42 +0000 (13:19 +0100)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 14 Oct 2010 02:05:30 +0000 (03:05 +0100)]
UBUNTU: Ubuntu-2.6.36-0.3
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 14 Oct 2010 00:59:02 +0000 (01:59 +0100)]
UBUNTU: [Config] disable CONFIG_SCSI_QLA_ISCSI to fix FTBS on powerpc
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 14 Oct 2010 02:02:24 +0000 (03:02 +0100)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 13 Oct 2010 22:27:53 +0000 (23:27 +0100)]
UBUNTU: Ubuntu-2.6.36-0.2
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 13 Oct 2010 22:26:27 +0000 (23:26 +0100)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 13 Oct 2010 22:24:49 +0000 (23:24 +0100)]
UBUNTU: [Config] updateportsconfigs following rebase to 2.6.36-rc7
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 12 Oct 2010 15:01:17 +0000 (16:01 +0100)]
UBUNTU: Ubuntu-2.6.36-0.1
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 12 Oct 2010 14:54:08 +0000 (15:54 +0100)]
UBUNTU: [Config] armel -- drop omap flavour
We are expecting to pick up the main arm flavours externally so drop
all but versatile from the main kernel for the moment.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 12 Oct 2010 14:21:08 +0000 (15:21 +0100)]
UBUNTU: [Config] enforcer -- ensure CONFIG_INIT_PASS_ALL_PARAMS is y
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Tim Gardner [Wed, 29 Sep 2010 13:46:33 +0000 (07:46 -0600)]
UBUNTU: [Config]: updateconfigs after adding brcm80211
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Fri, 1 Oct 2010 17:24:41 +0000 (11:24 -0600)]
UBUNTU: [Upstream] drivers/serial/mfd.c: Fix ARM compile error
drivers/serial/mfd.c: In function 'port_show_regs':
drivers/serial/mfd.c:144: error: implicit declaration of function 'kzalloc'
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Fri, 1 Oct 2010 16:43:31 +0000 (10:43 -0600)]
UBUNTU: [Config] CONFIG_SCSI_QLA_ISCSI=n for armel
It seems that readq/witeq were not defined for the ARM arch.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Wed, 29 Sep 2010 15:39:09 +0000 (09:39 -0600)]
UBUNTU: [Config] Add support for cross compiling armel
The best way to cross compile is by using dpkg-buildpackage, e.g.,
dpkg-buildpackage -B -aarmel
You'll likely have problems cross compiling the tools unless you've
built and installed some prerequisites, but thats your problem. Work
around the issue by deleting the tools directorty or specify do_tools=false.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Andy Whitcroft [Tue, 28 Sep 2010 13:18:25 +0000 (14:18 +0100)]
UBUNTU: reduce disk usage during buildd builds
BugLink: http://bugs.launchpad.net/bugs/645653
For each flavour build we keep all of intermediate trees intact.
This allows simple incremental updates in a development environment but
leads to very large disk footprints on the build. For Maverick with three
flavours we are seeing 19GB for i386 and 25GB for amd64. Anything over
15GB is likely to run the buildds out of disk and fail the build.
When building on a buildd (in full_build=true mode) clean out
the main build tree and the package tree for the debugging deb.
This reduces consumption to more like 10GB maximum regardless of
the flavour count.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Tim Gardner [Wed, 22 Sep 2010 10:40:20 +0000 (18:40 +0800)]
UBUNTU: [Config] Disable aufs, dmraid-4.5, ndis-wrapper
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Wed, 22 Sep 2010 10:22:53 +0000 (18:22 +0800)]
UBUNTU: more dropped patches
Signed-off-by: Tim Gardner <rtg@tyler.taipei>
Tim Gardner [Wed, 22 Sep 2010 09:11:23 +0000 (03:11 -0600)]
UBUNTU: Added dropped patch list
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Christopher James Halse Rogers [Fri, 17 Sep 2010 16:17:56 +0000 (17:17 +0100)]
UBUNTU: SAUCE: Nouveau: Disable acceleration on MacBook Pros
BugLink: http://bugs.launchpad.net/bugs/546393
Upstream obviously wants to fix acceleration rather than disable it.
For Lucid however we need these cards to boot more than we need them to
be fast.
With acceleration enabled these cards hang during boot.
Signed-off-by: Christopher James Halse Rogers <raof@ubuntu.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Christopher James Halse Rogers [Fri, 17 Sep 2010 16:17:55 +0000 (17:17 +0100)]
UBUNTU: SAUCE: Nouveau: Add quirk framework to disable acceleration
Add support for Nouveau acceleration quirks.
BugLink: http://bugs.launchpad.net/bugs/546393
BugLink: http://bugs.launchpad.net/bugs/544088
Signed-off-by: Christopher James Halse Rogers <raof@ubuntu.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
John Johansen [Wed, 15 Sep 2010 17:28:20 +0000 (10:28 -0700)]
UBUNTU: SAUCE: Improve Amazon EBS performance for EC2
OriginalAuthor: Amazona from Ben Howard <behoward@amazon.com>
BugLink: http://bugs.launchpad.net/bugs/634316
The pv-ops kernel suffers from poor performance when using Amazon's
Elastic block storage (EBS). This patch from Amazon improves pv-ops
kernel performance, and has not exhibited any regressions.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Henrik Rydberg [Fri, 10 Sep 2010 14:06:02 +0000 (16:06 +0200)]
UBUNTU: SAUCE: hid: ntrig: zero-initialize ntrig struct
Setting zeros using kzalloc instead.
Has been tested succesfully on Dell Studio 17, Dell XT2, HP TX2 and
Lenovo T410s. Not likely to go upstream in its present form. However,
it does help constitue a tuning-free driver which works well together
with Unity, and as such are vital to the MT push.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Henrik Rydberg [Fri, 10 Sep 2010 14:03:45 +0000 (16:03 +0200)]
UBUNTU: SAUCE: hid: ntrig: Correct logic for quirks
The driver data is a bitmask, check for correct bits.
Has been tested succesfully on Dell Studio 17, Dell XT2, HP TX2 and
Lenovo T410s. Not likely to go upstream in its present form. However,
it does help constitue a tuning-free driver which works well together
with Unity, and as such are vital to the MT push.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Henrik Rydberg [Fri, 10 Sep 2010 13:46:36 +0000 (15:46 +0200)]
UBUNTU: SAUCE: hid: ntrig: Remove unused device ids
The current set of devices (Dell Studio 17, Dell XT2, HP TX2, Lenovo T810s)
all use the same device id (1b96:0001). However, the driver defines a
range of device ids. Remove these and reintroduce when needed, in
anticipation that new devices will not work with the current driver
anyways.
Has been tested succesfully on Dell Studio 17, Dell XT2, HP TX2 and
Lenovo T410s. Not likely to go upstream in its present form. However,
it does help constitue a tuning-free driver which works well together
with Unity, and as such are vital to the MT push.
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Acked-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Wed, 8 Sep 2010 16:13:41 +0000 (09:13 -0700)]
UBUNTU: SAUCE: ndiswrapper: Initialize buffer index and check its value
BugLink: http://bugs.launchpad.net/bugs/613796
The following commit propagated a change to ndiswrapper which originated
from upstream to convert multicast list to list_head.
commit
e2fce7c6af6e1bcd2f577304a5200738d076d98f
Author: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Thu Jun 3 13:34:15 2010 -0700
UBUNTU: SAUCE: ndiswrapper: convert multicast list to list_head
In making the change we accidentally forgot to carry forward
initialization of a buffer index and properly check its value. Add this
missing functionality which previously existed.
We should squash this patch with commit
e2fce7c6a upon the next rebase.
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Daniel Lezcano [Tue, 7 Sep 2010 19:45:11 +0000 (21:45 +0200)]
UBUNTU: SAUCE: fix compilation warning when CONFIG_SECURITY is not set
Function prototype differs when CONFIG_SECURITY is not set leading to
a warning:
include/linux/security.h: In function ‘security_task_free’:
include/linux/security.h:2244: warning: no return statement in function returning non-void
The patch that introduced this warning was Maverick commit:
commit
2aec770a575b15cb1e43c2e16dff4f00a02a8c9a
Author: Kees Cook <kees.cook@canonical.com>
Date: Mon Jun 28 22:34:04 2010 -0700
UBUNTU: SAUCE: security: create task_free security callback
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>
Nicolas Pitre [Mon, 14 Jun 2010 20:27:19 +0000 (16:27 -0400)]
[ARM] implement arch_randomize_brk()
For this feature to take effect, CONFIG_COMPAT_BRK must be turned
off. This can safely be turned off for any EABI user space versions.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
(cherry picked from commit
990cb8acf23cab19a2930f1ed5e7dc108f89079b)
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Nicolas Pitre [Tue, 25 May 2010 03:55:42 +0000 (23:55 -0400)]
ARM: initial stack protector (-fstack-protector) support
This is the very basic stuff without the changing canary upon
task switch yet. Just the Kconfig option and a constant canary
value initialized at boot time.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
(cherry picked from commit
c743f38013aeff58ef6252601e397b5ba281c633)
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Mathieu J. Poirier [Tue, 17 Aug 2010 15:16:41 +0000 (11:16 -0400)]
UBUNTU: SAUCE: (no-up) ARM: Resetting power_mode to its original value.
This reverts the second part of patch:
commit
6da20c89af64b75302399369a90b9d50c1a87665
Author: Adrian Hunter <adrian.hunter@nokia.com>
Date: Mon Feb 15 10:03:34 2010 -0800
omap_hsmmc: Ensure regulator enable / disable are paired
Without this the kernel fails to initialize the SDHC card and find the
root partition. Work is currently underway with the community to find a
real solution to the problem. This a temporary measure to unblock
developers and will have to be reverted when the real fix gets upstream.
BugLink: https://bugs.launchpad.net/bugs/591941
Signed-off-by: Mathieu Poirier <mathieu.poirier@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 13 Aug 2010 19:37:41 +0000 (12:37 -0700)]
UBUNTU: ubuntu: rtl8192se -- update to version 0017.0507.2010
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Wed, 11 Aug 2010 18:02:38 +0000 (11:02 -0700)]
UBUNTU: ubuntu: iscsitarget -- version 1.4.20.2
Update iscsitarget to the latest stable version (v1.4.20.2) from
sourceforge.
ExternalDriver: iscsi_trgt
Url: http://sourceforge.net/projects/iscsitarget/files/
Version: 1.4.20.2
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Fri, 30 Jul 2010 12:08:25 +0000 (14:08 +0200)]
ALSA: hda - Handle pin NID 0x1a on ALC259/269
BugLink: http://bugs.launchpad.net/bugs/582199
BugLink: http://bugs.launchpad.net/bugs/586418
BugLink: http://bugs.launchpad.net/bugs/588031
The pin NID 0x1a should be handled as well as NID 0x1b.
Also added comments.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit
b08b1637ce1c0196970348bcabf40f04b6b3d58e in
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Takashi Iwai [Fri, 30 Jul 2010 08:51:10 +0000 (10:51 +0200)]
ALSA: hda - Handle missing NID 0x1b on ALC259 codec
BugLink: http://bugs.launchpad.net/bugs/582199
BugLink: http://bugs.launchpad.net/bugs/586418
BugLink: http://bugs.launchpad.net/bugs/588031
Since ALC259/269 use the same parser of ALC268, the pin 0x1b was ignored
as an invalid widget. Just add this NID to handle properly.
This will add the missing mixer controls for some devices.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit
5d4abf93ea3192cc666430225a29a4978c97c57d in
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git)
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
John Johansen [Wed, 28 Jul 2010 18:44:04 +0000 (11:44 -0700)]
UBUNTU: SAUCE: blkfront: default to sd devices
EC2 defaults to "/dev/sda" rather than "/dev/xvd". Once they finally
switch then this patch should be dropped.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
John Johansen [Tue, 27 Jul 2010 13:06:07 +0000 (06:06 -0700)]
UBUNTU: SAUCE: fix pv-ops for legacy Xen
Import fix_xen_guest_on_old_EC2.patch from fedora 14
Legacy hypervisors (RHEL 5.0 and RHEL 5.1) do not handle guest writes to
cr4 gracefully. If a guest attempts to write a bit of cr4 that is
unsupported, then the HV is so offended it crashes the domain. While
later guest kernels (such as RHEL6) don't assume the HV supports all
features, they do expect nicer responses. That assumption introduced
code that probes whether or not xsave is supported early in the boot. So
now when attempting to boot a RHEL6 guest on RHEL5.0 or RHEL5.1 an early
crash will occur.
This patch is quite obviously an undesirable hack. The real fix for this
problem should be in the HV, and is, in later HVs. However, to support
running on old HVs, RHEL6 can take this small change. No impact will
occur for running on any RHEL HV (not even RHEL 5.5 supports xsave).
There is only potential for guest performance loss on upstream Xen.
All this by way of explanation for why is this patch not going upstream.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
John Johansen [Fri, 23 Jul 2010 12:53:56 +0000 (05:53 -0700)]
UBUNTU: SAUCE: AppArmor: Allow dfa backward compatibility with broken userspace
Allow broken Lucid userspace tools to load policy, on Maverick kernel.
The fix for http://launchpad.net/bugs/581525 blocks Lucid tools from
loading policy, this provides compatibility with Lucid tools without
reintroducing the bug.
The apparmor_parser when compiling policy could generate invalid dfas
that did not have sufficient padding to avoid invalid references, when
used by the kernel. The kernels check to verify the next/check table
size was broken meaning invalid dfas were being created by userspace
and not caught.
To remain compatible with old tools that are not fixed, pad the loaded
dfas next/check table. The dfa's themselves are valid except for the
high padding for potentially invalid transitions (high bounds error),
which have a maximimum is 256 entries. So just allocate an extra null filled
256 entries for the next/check tables. This will guarentee all bounds
are good and invalid transitions go to the null (0) state.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Thu, 29 Jul 2010 15:36:31 +0000 (16:36 +0100)]
UBUNTU: SAUCE: vt -- allow grub to request automatic vt_handoff
Grub may be able to select a graphics mode and paint a splash screen
for us. If so it needs to be able to tell us it has done so. Add
support for detecting a new graphics mode selected bit in the
screen_info passed over at boot. Use this to automatically enable
vt_handoff mode.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Thu, 29 Jul 2010 15:36:30 +0000 (16:36 +0100)]
UBUNTU: SAUCE: vt -- maintain bootloader screen mode and content until vt switch
Introduce a new VT mode KD_TRANSPARENT which endevours to leave the current
content of the framebuffer untouched. This allows the bootloader to insert
a graphical splash and have the kernel maintain it until the OS splash
can take over. When we finally switch away (either through programs like
plymouth or manually) the content is lost and the VT reverts to text mode.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Thu, 29 Jul 2010 08:46:41 +0000 (09:46 +0100)]
UBUNTU: SAUCE: add tracing for user initiated readahead requests
Track pages which undergo readahead and for each record which were
actually consumed, via either read or faulted into a map. This allows
userspace readahead applications (such as ureadahead) to track which
pages in core at the end of a boot are actually required and generate an
optimal readahead pack. It also allows pack adjustment and optimisation
in parallel with readahead, allowing the pack to evolve to be accurate
as userspace paths change. The status of the pages are reported back via
the mincore() call using a newly allocated bit.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Thu, 29 Jul 2010 08:42:21 +0000 (09:42 +0100)]
UBUNTU: SAUCE: (no-up) Modularize vesafb -- fix initialisation
When this patch was rolled forward, likely between Dapper and Hardy
a chunk of initialisation was lost. Pull this back in so we actually
have an vesafb_info structure initialised. Else we may well panic when
we rmmod vesafb.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Lee Jones [Wed, 21 Jul 2010 09:32:26 +0000 (11:32 +0200)]
UBUNTU: SAUCE: OMAP: DSS2: enable hsclk in dsi_pll_init for OMAP36XX
BugLink: http://bugs.launchpad.net/bugs/608095
This helps provide the required setup to enable USB Ethernet (usb0) and
USB host on the XM Beagleboard (A rev). This will be submitted upstream
by Steve Sakoman.
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Lee Jones <lee.jones@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Lee Jones [Wed, 21 Jul 2010 09:30:33 +0000 (11:30 +0200)]
UBUNTU: SAUCE: OMAP: DSS2: check for both cpu type and revision, rather than just revision
BugLink: http://bugs.launchpad.net/bugs/608095
This helps provide the required setup to enable USB Ethernet (usb0) and
USB host on the XM Beagleboard (A rev). This will be submitted upstream
by Steve Sakoman.
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Lee Jones <lee.jones@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Lee Jones [Wed, 21 Jul 2010 09:24:40 +0000 (11:24 +0200)]
UBUNTU: SAUCE: ARM: OMAP: Add macros for comparing silicon revision
BugLink: http://bugs.launchpad.net/bugs/608095
Adapted from arago project patch by Sanjeev Premi <premi@ti.com>
This helps provide the required setup to enable USB Ethernet (usb0) and
USB host on the XM Beagleboard (A rev). This will be submitted upstream
by Steve Sakoman.
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Lee Jones <lee.jones@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Lee Jones [Fri, 16 Jul 2010 08:37:31 +0000 (09:37 +0100)]
UBUNTU: Stop ARM boards crashing when CUPS is loaded
BugLink: http://bugs.launchpad.net/bugs/601226
When CUPS loads, it tries to load several drivers it may need. When
one of these drivers, specifically parport_pc is loaded, it attempts
to write to address space normally reserved for ISA transactions.
On OMAP based systems, this causes a segmentation fault.
Signed-off-by: Lee Jones <lee.jones@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Thu, 15 Jul 2010 16:24:41 +0000 (17:24 +0100)]
UBUNTU: ubuntu: AUFS -- update to
b37c575759dc4535ccc03241c584ad5fe69e3b25
commit
b37c575759dc4535ccc03241c584ad5fe69e3b25
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sun Jul 4 21:06:02 2010 +0900
aufs: minor update abput the doubling donations
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
799db4b1d59ea0ffc999889bc6985397333e9a13
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jul 2 00:37:56 2010 +0900
aufs: compat_ioctl, implement the operations
(A commit in a series of supporting 32bit emulation under 64bit kernel.
While every commit is git-bisect-able, you shoule read all commits in
the series since a single commit may have less meaning.)
Implement f_op->compat_ioctl().
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
765378b55abcabfe3344e5fcf2eabd6a1d52abc0
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jul 2 00:35:17 2010 +0900
aufs: compat_ioctl, make a room for a pointer
(A commit in a series of supporting 32bit emulation under 64bit kernel.
While every commit is git-bisect-able, you shoule read all commits in
the series since a single commit may have less meaning.)
In order to make it compatible, make a room for a pointer and always
handle it as 64bit size.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
abd339c757ea095f1affdd648d0e9e598213a790
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jul 2 00:29:00 2010 +0900
aufs: compat_ioctl, remove verifying the size of ptr
(A commit in a series of supporting 32bit emulation under 64bit kernel.
While every commit is git-bisect-able, you shoule read all commits in
the series since a single commit may have less meaning.)
Remove verifying the size of ptr which is meaningless.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
3c979528184058b184608e6e3086c4c59b0a6c86
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jul 2 00:04:33 2010 +0900
aufs: follow 2.6.28, new flag LOOKUP_EXCL
NFS replaces the internal test for LOOKUP_CREATE by a new flag
LOOKUP_EXCL.
Aufs has to prohibit this internal test in order to know whether the
file exists or not.
Reported-by: "Ian Stakenvicius, Aerobiology Research" <ian@aerobiology.ca>
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
396a2f097a6b278fc2a9e9da83b87255f60075fb
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Jun 29 14:32:26 2010 +0900
aufs: bugfix, separate the workqueue for preprocessing mmap
variation of common AB-BA deadlock problem.
ProcessA:
- aufs_mmap
+ pre-process with using a workqueue
+ wait until return from the workqueue
Workqueue task for ProcessA:
- acquire aufs rwsem
Processb
- lookup or readdir in aufs
+ acquire aufs rwsem
+ assign a new inode number
+ write the value to the XINO file using a workqueue
+ wait until return from the workqueue
Since the workqueue handles the request one by one, both of processA and
B waits forever.
This bug was introduced by the commit
d986fa5 2010-03-08
aufs: bugfix, another approach to keep the lock order of mmap_sem
which is the last added workqueue task.
And this is the only one task which acquires such lock in workqueue.
To fix it, introduce another workqueue which is for preprocessing mmap only.
This commit will make the approach more ugly, I don't have another option.
Reported-by: Oliver Welter <mail@oliwel.de>
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
7c7f493d58745e45160ccebfbfb5e6244dbd0b52
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jun 25 10:52:59 2010 +0900
aufs: tiny, debug print [if]_version
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
ade8662cb1184703ebdd7c7d07cb42d2056a605b
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sat Jun 19 16:38:15 2010 +0900
aufs: follow the changes in 2.6.35, lockdep for sb->s_vfs_rename_mutex
lockdep_set_class() is applied to sb->s_vfs_rename_mutex, and
lockdep_off/on() in aufs become unnecessary.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
d405a78a328658600f1928309bfbd2ded6136c59
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sat Jun 19 03:36:21 2010 +0900
aufs: tiny, remove unused lockdep_off/on()
In linux-2.6.31, lockdep_set_class() was applited to them.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
a4862273fc684dd24a9e0b4c29f89aaf53723afc
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Thu Jun 17 23:39:13 2010 +0900
aufs: several GIT servers
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
135ac88ed89e4780dc71bef119b803d4c594ea07
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Jun 16 18:11:40 2010 +0900
aufs: possible bugfix, sbinfo lock in deleting inode, lockdep
(A commit in a series of introducing pid map/tree and making sure to
acquire sbinfo lock in deleting inode. While every commit is
git-bisect-able, you shoule read all commits in the series since a
single commit may have less meaning.)
A debugging feature in linux kernel, lockdep, warns
"inconsistent {RECLAIM_FS-ON-W} -> {IN-RECLAIM_FS-R} usage."
about sb->s_umount and aufs sbinfo lock.
This is bogus or "false positive" since {RECLAIM_FS-ON-W} state was
registered at allcating the root inode at mounting. This is definitly no
RECLAIM state. It may be a limitation of s_umount in lockdep.
Let's simply make it quiet.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
6ef8250091897e1cf7e8b77a7cfc61c7ffe58b58
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Jun 16 18:03:48 2010 +0900
aufs: possible bugfix, sbinfo lock in deleting inode, core
(A commit in a series of introducing pid map/tree and making sure to
acquire sbinfo lock in deleting inode. While every commit is
git-bisect-able, you shoule read all commits in the series since a
single commit may have less meaning.)
s_umount rwsem in struct super_block prevents a race condition among
umount, remount and kswapd. It is good.
But if an inode is going to be deleted by other than kswapd, aufs may be
doing another operation which requires a lock for sbinfo. In this case,
si_noflush_read_trylock() in au_iinfo_fin() will not acquire the
lock. Before au_iinfo_fin() completes or during its operations, another
operation may release the lock and remount or a branch management
process may start. Here if the branch management process changes the
union members, then xino management in au_iinfo_fin() will not work
correctly.
In order to fix this potential problem, there another bad approch is
introduced which uses a bitmap to mark the pid which acquired the sbinfo
lock. In au_iinfo_fin(), if the bit is set, then the function will not
try acquiring the lock.
To support the pid larger than PID_MAX_DEFAULT, sbinfo prepares a radix
tree too.
With this commit, we can remove si_noflush_read_trylock(). But it will
be necessary in aufs2-31 branch, so leave it now.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
eb6254f4b0080f01b3356a40bdd62d7130bf1951
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Jun 16 17:51:00 2010 +0900
aufs: possible bugfix, sbinfo lock in deleting inode, use si_pid
(A commit in a series of introducing pid map/tree and making sure to
acquire sbinfo lock in deleting inode. While every commit is
git-bisect-able, you shoule read all commits in the series since a
single commit may have less meaning.)
Use si_pid which was declared and implmented by last commit.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
89d59298f045a8a7e2c5a667dfc3ee3b3fe8745a
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Jun 16 17:43:12 2010 +0900
aufs: possible bugfix, sbinfo lock in deleting inode, si_pid functions
(A commit in a series of introducing pid map/tree and making sure to
acquire sbinfo lock in deleting inode. While every commit is
git-bisect-able, you shoule read all commits in the series since a
single commit may have less meaning.)
Declare and implement si_pid functions which are not used yet.
The pid from 1 to PID_MAX_DEFAULT are marked in a new bitmap in
sbinfo. The larger pids will go to a new radix tree in sbinfo.
These marks will be referenced by au_iinfo_fin() in succeeding commit.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
40d554b0f6a6bc588fd88235f39b59f30ec27114
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Jun 16 17:30:03 2010 +0900
aufs: possible bugfix, sbinfo lock in deleting inode, __si_ lock
(A commit in a series of introducing pid map/tree and making sure to
acquire sbinfo lock in deleting inode. While every commit is
git-bisect-able, you shoule read all commits in the series since a
single commit may have less meaning.)
Rename si_noflush_... lock macros to __si_..., and create new inlined
functions si_noflush_....
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
f2f51daf576fa90ad7209288ed8b19c8151ff92a
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Jun 9 17:03:00 2010 +0900
aufs: tiny, simplify the locks in au_do_flush()
The read-lock for dinfo is unnecessary.
Also the write-lock for iinfo should be a read-lock.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
bdc941c464fd4181f7ab76fbb992b6ab150ac188
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Jun 8 23:28:03 2010 +0900
aufs: minor optimization au_iinfo_fin()
- extract a part of au_iinfo_fin(), create a new function
au_xino_delete_inode(), and remove au_iinfo_write0().
- simplify au_xino_write0() and rename to au_xib_clear_bit().
- convert the type of au_xigen_inc() into void.
- stop testing 'xino' option in au_xigen_inc().
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
7e7b86c68cf5d3638ceb19a0a1d7a254d8501bde
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Jun 8 00:08:00 2010 +0900
aufs: tiny, remove an unnecessary variable
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
ea824b7a71cd905fdadcb0998ab2005fcb3786e9
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Jun 8 00:06:55 2010 +0900
aufs: minor optimization, pass the 'verbose' flag
Stop testing the 'verbose' flag in all test_dentry_busy(),
test_inode_busy() and au_br_del() functions. Instead pass the tested
result from au_br_del() to test_dentry_busy() and test_inode_busy().
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
cabc97fe740d2c7664988e76f218318aecd5ec18
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Mon Jun 7 14:45:15 2010 +0900
aufs: tiny, test task flags instead of mm
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
575bf8c6484fd12a0719a7ebcf6c0d2fd0af31f3
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jun 4 14:55:42 2010 +0900
aufs: follow linux-2.6.35, simple_setsize()
Replace vmtruncate() by a new function simple_setsize().
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
c503a51d10c9c7767f1eba8e47de545d31ab7858
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jun 4 02:54:13 2010 +0900
aufs: bugfix, the dentry paramter for security funcs
Pass the correct parameter.
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
92172f59e363f630ab44217e78135cdeff90ba0d
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Fri Jun 4 02:09:23 2010 +0900
aufs: tiny, fake type-cast by union
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
9f8ad8ca00cf7677e9d982c9e98d4b7586e759f6
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Wed Jun 2 23:38:37 2010 +0900
aufs: possible bugfix, revalidate inode race between readdir and lookup
Both of readdir and lookup operation need to assign the aufs inode
number, but it requires other aufs locks including xi_nondir_mtx which
prevents hard-linked inode number from race condition. There can happen
a violation of the order of these locks.
They acquire these locks.
aufs_readdir("./dirA")
+ si_read_lock
+ fi_write_lock
+ di_write_lock
+ ii_write_lock for dirA
+ xi_nondir_mtx for non-dir
aufs_lookup("./dirA/fileB")
+ si_read_lock
+ di_write_lock
+ xi_nondir_mtx for non-dir
+ ii_write_lock_nested for fileB
Here the fileB may be in copy-up operation which acquires the parent's
dentry-info and inode->info lock. So aufs_lookup() waits for the
completion of copy-up, aufs_readdir() waits for xi_nondir_mtx, and the
copy-up waits for the parent, but it is held by readdir.
This is very complicated situation and I am afraid the design of aufs
inode assignment is not godd. But I don't have other idea.
This commit refines xi_nondir_mtx and releases it before
"ii_write_lock_nested for fileB."
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
commit
907f03a11f5a681de402d733b6e80532adece324
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Tue Jun 1 01:41:43 2010 +0900
aufs: tiny, follow the changes in linux-2.6.35-rcN
The dentry parameter is removed from ->fsync().
Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Fri, 2 Jul 2010 17:45:50 +0000 (18:45 +0100)]
UBUNTU: ubuntu: AUFS -- add BOM and automated update script
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Kees Cook [Tue, 13 Jul 2010 21:54:56 +0000 (14:54 -0700)]
UBUNTU: SAUCE: Yama: verify inode is symlink to avoid bind mounts
The inode_follow_link LSM hook is called in bind mount situations as
well as for symlink situations, so we must explicitly check for the
inode being a symlink to not reject bind mounts in 1777 directories,
which seems to be a common NFSv4 configuration.
BugLink: https://bugs.launchpad.net/bugs/604407
[submitted upstream to security-next]
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Kees Cook [Tue, 13 Jul 2010 16:04:08 +0000 (09:04 -0700)]
UBUNTU: SAUCE: Yama: search for PTRACE exceptions via thread group leader
When looking for PTRACE exceptions, the thread group leader must be used
otherwise the exceptions can be missed for threaded processes.
BugLink: https://bugs.launchpad.net/bugs/603716
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Kees Cook [Sat, 10 Jul 2010 19:12:20 +0000 (12:12 -0700)]
UBUNTU: SAUCE: Yama: check PTRACE using thread group leader
When examining process ancestory, we must use the thread group leader
or else we end up missing potential matches.
[submitted upstream to security-next]
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Nicolas Pitre [Tue, 13 Jul 2010 04:58:12 +0000 (00:58 -0400)]
UBUNTU: SAUCE: make ndiswrapper available on X86 only
There are several functions in ntoskernel.* with inline x86 assembler.
Thus enable ndiswrapper for X86 only, especially when it gets enabled by
default in Kconfig.
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Tim Gardner [Tue, 13 Jul 2010 12:41:16 +0000 (06:41 -0600)]
UBUNTU: SAUCE: fix build error with CONFIG_BLK_DEV_INITRD=n
The original aynchronous boot patch (UBUNTU: SAUCE: Make populate_rootfs asynchronous)
did not take into consideration the case when CONFIG_BLK_DEV_INITRD=n,
e.g., populate_rootfs_domain becomes undefined. Therefore, add it to
noinitramfs.c where its use is benign.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Original-patch-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Surbhi Palande <surbhi.palande@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Kees Cook [Tue, 29 Jun 2010 18:07:44 +0000 (11:07 -0700)]
UBUNTU: SAUCE: security: unconditionally chain to Yama LSM
This patch forces the LSM to always chain through the Yama LSM
regardless of which LSM is selected as the primary LSM.
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Kees Cook [Tue, 29 Jun 2010 05:36:00 +0000 (22:36 -0700)]
UBUNTU: SAUCE: Yama: add PTRACE exception tracking and interface
Some application suites have external crash handlers that depend on
being able to use PTRACE to generate crash reports (KDE, Chromium, etc).
Since the inferior process generally knows the PID of the debugger,
it can use PR_SET_PTRACER to allow a specific PID and its descendants
to perform the PTRACE instead of only a direct ancestor.
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Kees Cook [Tue, 29 Jun 2010 05:34:04 +0000 (22:34 -0700)]
UBUNTU: SAUCE: security: create task_free security callback
The current LSM interface to cred_free is not sufficient for allowing
an LSM to track the life and death of a task. This patch adds the
task_free hook so that an LSM can clean up resources on task death.
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Kees Cook [Mon, 21 Jun 2010 20:07:07 +0000 (13:07 -0700)]
UBUNTU: [Upstream] security: Yama LSM
This adds the Yama Linux Security Module to collect several security
features (symlink, hardlink, and PTRACE restrictions) that have existed
in various forms over the years and have been carried outside the mainline
kernel by other Linux distributions like Openwall and grsecurity.
Currently accepted in upstream security tree:
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git next
Signed-off-by: Kees Cook <kees.cook@canonical.com>
[kees: resolved AppArmor conflicts for Maverick merge]
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Mathieu J. Poirier [Sun, 27 Jun 2010 20:08:58 +0000 (14:08 -0600)]
UBUNTU: ARM: Adding regulator supply for vdds_sdi.
The omapfb driver couldn't locate its display sink because of
an initialisation error in the DSS subsystem. This error was
caused by a missing 'sdi' entry in the board power regulator list.
BugLink: https://bugs.launchpad.net/bugs/597904
Signed-off-by: Mathieu Poirier <mathieu.poirier@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Chase Douglas [Thu, 24 Jun 2010 15:37:29 +0000 (11:37 -0400)]
UBUNTU: [Upstream] HID: magicmouse: add param for scroll speed
The new scroll_speed param takes an integer value from 0 to 63, where 0
is slowest and 63 is fastest. The default of 32 remains the same. This
parameter also affects scroll acceleration linearly.
A second part of this change is a tightly coupled modification to the
scroll acceleration. Previously, scroll acceleration could be reset
without lifting the scroll finger. This is rather unintuitive and hard
to control in the case where a user wants faster scrolling, but wants to
hold the scroll touch for longer than a moment.
Note that scroll acceleration levels are now 1-7, where 7 is slowest. In
the previous implementation, there were 8 levels defined, but it was
impossible to start at the slowest level. In order to keep the default
scroll speed unchanged, only 7 levels are used now.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Acked-by: Michael Poole <mdpoole@troilus.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit
0b778e76c1e7ccf49f8980b594e72f984095fd26
from git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git)
Acked-by: Steve Conklin <steve.conklin@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Chase Douglas [Thu, 24 Jun 2010 15:37:28 +0000 (11:37 -0400)]
UBUNTU: [Upstream] HID: magicmouse: properly account for scroll movement in state
Before this change, sequential scroll events would take a variable
amount of movement due to incorrect accounting. This change ensures all
scroll movements require a deterministic touch movement for an action to
occur.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Acked-by: Michael Poole <mdpoole@troilus.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit
8d93efb27ab8927ffc7a357f1b2d10039de50ed4
from git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git)
Acked-by: Steve Conklin <steve.conklin@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Chase Douglas [Thu, 24 Jun 2010 15:37:27 +0000 (11:37 -0400)]
UBUNTU: [Upstream] HID: magicmouse: disable and add module param for scroll acceleration
Scroll acceleration is unique to the magicmouse driver, and is
unintuitive to a user who is unaware of the functionality. Thus, disable
it by default, but add a module parameter to enable it for power users
who want it.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Acked-by: Michael Poole <mdpoole@troilus.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit
9846f350ef4d4108c1154acfc125fe8d8630ef84
from git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git)
Acked-by: Steve Conklin <steve.conklin@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Chase Douglas [Thu, 24 Jun 2010 15:37:26 +0000 (11:37 -0400)]
UBUNTU: [Upstream] HID: magicmouse: scroll on entire surface, not just middle of mouse
Previously, scroll events only occurred when the user moved a touch
along the middle of the touch surface. This is unintuitive for a normal
user who is not aware of this. The device has a uniform surface, so the
distinction is artificial. This change removes the touch area check for
a scroll event, which replicates the OS X behavior.
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Acked-by: Michael Poole <mdpoole@troilus.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
(cherry picked from commit
ef566d30a702cc9b49d24edc4ad45c62208a4f5d
from git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git)
Acked-by: Steve Conklin <steve.conklin@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Chase Douglas [Thu, 17 Jun 2010 21:08:11 +0000 (17:08 -0400)]
perf probe: Add kernel source path option
The probe plugin requires access to the source code for some operations. The
source code must be in the exact same location as specified by the DWARF tags,
but sometimes the location is an absolute path that cannot be replicated by a
normal user. This change adds the -s|--source option to allow the user to
specify the root of the kernel source tree.
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
LKML-Reference: <
1276543590-10486-1-git-send-email-chase.douglas@canonical.com>
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
(cherry picked from commit
9ed7e1b85cd55dc46cb9410a23086bdaa2ff3eb9 from
git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6.git)
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Thu, 17 Jun 2010 09:46:47 +0000 (10:46 +0100)]
UBUNTU: SAUCE: add option to hand off all kernel parameters to init
BugLink: http://bugs.launchpad.net/bugs/586386
Some init packages such as upstart find having all of the kernel parameters
passed in useful. Currently they have to open up /proc/cmdline and
reparse that to obtain this information. Add a kernel configuration
option to enable passing of all options.
Note, enabling this option will reduce the chances that a fallback from
/sbin/init to /bin/bash or /bin/sh will succeed. Though it should be
noted that there are commonly unknown options present which would already
break this fallback. init=/bin/foo provides explicit control over options
which is unaffected by this change.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Thu, 10 Jun 2010 21:51:54 +0000 (14:51 -0700)]
UBUNTU: [Upstream] USB: option: Remove duplicate AMOI_VENDOR_ID
AMOI_VENDOR_ID is defined twice. Remove the duplicate entry and move
the AMOI_PRODUCT_9508 definition to be grouped with the other AMOI
product definitions.
Sent upstream:
http://thread.gmane.org/gmane.linux.usb.general/32545
Originally-by: Ben Collins <ben.collins@ubuntu.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Thu, 3 Jun 2010 20:34:15 +0000 (13:34 -0700)]
UBUNTU: SAUCE: ndiswrapper: convert multicast list to list_head
The following upstream commit removed mc_count from struct net_device
and converts multicast lists to list_head:
commit
22bedad3ce112d5ca1eaf043d4990fa2ed698c87
Author: Jiri Pirko <jpirko@redhat.com>
Date: Thu Apr 1 21:22:57 2010 +0000
net: convert multicast list to list_head
Thus, we need to convert ndiscrapper to incorporate the same changes to
avoid build failures.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Thu, 3 Jun 2010 07:40:41 +0000 (08:40 +0100)]
UBUNTU: ubuntu: AUFS -- track changes to the arguements to fop fsync()
The file operation fsync dropped an unused struct dentry parameter,
apply this change to aufs2:
commit
7ea8085910ef3dd4f3cad6845aaa2b580d39b115
Author: Christoph Hellwig <hch@lst.de>
Date: Wed May 26 17:53:25 2010 +0200
drop unused dentry argument to ->fsync
WARNING: this currently removes support for syncing some forms of aufs
directory as we are now required to have a filp to sync against and aufs
does not always have them. I have added a WARN_ON to try and track the
triggers for this mode if any.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Thu, 3 Jun 2010 07:34:46 +0000 (08:34 +0100)]
UBUNTU: ubuntu: AUFS -- update to standalone 2.6.35-rcN as at
20100601
BugLink: http://bugs.launchpad.net/bugs/587888
Update to current aufs2 for v2.6.35-rcN:
commit
a9be01e5e9688018ebe9ef46ec5414bb356bc556
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sun May 30 04:40:49 2010 +0900
aufs: fi_hdir, rename au_do_refresh_file() to au_do_refresh_dir()
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Thu, 3 Jun 2010 03:42:24 +0000 (20:42 -0700)]
UBUNTU: SAUCE: ndiswrapper: rename usb_buffer_alloc() and usb_buffer_free()
usb_buffer_alloc() is renamed to usb_alloc_coherent()
usb_buffer_free() is renamed to usb_free_coherent()
This is due to the removal of the usb_buffer_alloc() and
usb_buffer_free() macros:
commit
e26bcf37234c67624f62d9fc95f922b8dbda1363
Author: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu Apr 29 15:46:07 2010 -0700
USB: remove unused usb_buffer_alloc and usb_buffer_free macros
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Tue, 1 Jun 2010 13:23:50 +0000 (14:23 +0100)]
UBUNTU: ubuntu: AUFS -- update to standalone 2.6.34 as at
20100601
BugLink: http://bugs.launchpad.net/bugs/587888
Update to current aufs2 for v2.6.34:
commit
a9be01e5e9688018ebe9ef46ec5414bb356bc556
Author: J. R. Okajima <hooanon05@yahoo.co.jp>
Date: Sun May 30 04:40:49 2010 +0900
aufs: fi_hdir, rename au_do_refresh_file() to au_do_refresh_dir()
Also adds ubuntu/aufs/include to the include path for aufs so it can
find its types.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Tue, 1 Jun 2010 13:10:55 +0000 (14:10 +0100)]
UBUNTU: ubuntu: AUFS -- aufs2 base patch for linux-2.6.34
BugLink: http://bugs.launchpad.net/bugs/587888
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Wed, 26 May 2010 02:31:39 +0000 (19:31 -0700)]
UBUNTU: ubuntu: iscsitarget -- version 1.4.20.1
Update iscsitarget to the latest stable version (v1.4.20.1) from
sourceforge.
ExternalDriver: iscsi_trgt
Url: http://sourceforge.net/projects/iscsitarget/files/
Version: 1.4.20.1
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Tim Gardner [Wed, 19 May 2010 15:17:26 +0000 (09:17 -0600)]
UBUNTU: SAUCE: Updated ndiswrapper to 1.56
BugLink: http://bugs.launchpad.net/bugs/582555
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Tim Gardner [Fri, 23 Apr 2010 16:55:46 +0000 (10:55 -0600)]
UBUNTU: ubuntu: rtl8192se -- update to version 0015.0127.2010
BugLink: http://bugs.launchpad.net/bugs/567016
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Stefan Bader [Mon, 29 Mar 2010 17:12:36 +0000 (19:12 +0200)]
UBUNTU: SAUCE: (no-up) dma-mapping: Remove WARN_ON in dma_free_coherent
BugLink: http://bugs.launchpad.net/bugs/458201
Triggered by the following backtrace:
WARNING: at
/build/buildd/linux-2.6.32/arch/x86/include/asm/dma-mapping.h:154
___free_dma_mem_cluster+0x102/0x110()
[<
ffffffff81064f9b>] warn_slowpath_common+0x7b/0xc0
[<
ffffffff81064ff4>] warn_slowpath_null+0x14/0x20
[<
ffffffff8139a2a2>] ___free_dma_mem_cluster+0x102/0x110
[<
ffffffff8139a072>] __sym_mfree+0xd2/0x100
[<
ffffffff8139a109>] __sym_mfree_dma+0x69/0x100
[<
ffffffff8139245f>] sym_hcb_free+0x8f/0x1f0
This patch never will be accepted upstream because the WARN_ON
is supposed to perevent driver development which is only
compatible with x86 on x86 (ARM can sleep in that function).
The right way to fix it would be to make the offending function
use locks in the right way but that requires careful implementation.
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>