Tim Gardner [Mon, 22 Aug 2011 16:48:27 +0000 (10:48 -0600)]
UBUNTU: [Config] Build kernel image in parallel with modules
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Mon, 22 Aug 2011 16:43:08 +0000 (10:43 -0600)]
UBUNTU: [Config] Linearize and simplify tree preparation rules
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Mon, 22 Aug 2011 16:00:45 +0000 (10:00 -0600)]
UBUNTU: [Config] Linearize module/abi checks
The module and ABI checks are not independent, so make sure
the modules check is dependent on the ABI check having been
performed. Also drop some superfluous shortcuts along the way.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Mon, 22 Aug 2011 15:44:19 +0000 (09:44 -0600)]
UBUNTU: [Config] kernel preparation cannot be parallelized
Regardless of the concurrency setting, kernel preparation targets
cannot be made in parallel.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Mon, 22 Aug 2011 15:37:57 +0000 (09:37 -0600)]
UBUNTU: [Config] Simplify binary-udebs dependencies
binary-udebs are always dependent on binary-debs.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Tue, 23 Aug 2011 13:37:55 +0000 (07:37 -0600)]
UBUNTU: rebase to v3.1-rc3
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Andy Whitcroft [Fri, 19 Aug 2011 10:38:49 +0000 (11:38 +0100)]
UBUNTU: [Config] move ECRYPT_FS back to =y for all architectures
ecryptfs is non-autoloadable and so we need ECRYPT_FS=y. ECRYPT_FS has
recently gained support for trusted keys. This adds a dependancy on
ENCRYPTED_KEYS which in turn has a dependancy on TRUSTED_KEYS which in
turn is dependant on CONFIG_TCG_TPM. In order to have ECRYPT_FS built
in we have to build all of these others too.
BugLink: http://bugs.launchpad.net/bugs/827197
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Fri, 19 Aug 2011 11:26:06 +0000 (12:26 +0100)]
UBUNTU: record the compiler in the ABI and check for inconsistant builds
When pulling the compiled kernels to extract the ABI information also
extract the compiler used for that build. Record the result in the abi
directory so it is also recorded historically.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Stefan Bader [Tue, 16 Aug 2011 14:49:35 +0000 (16:49 +0200)]
UBUNTU: [Config] Force perf to use libiberty for demangling
Because libbfd is GPLv3 only and perf is GPLv2 only. Also this avoids
statically linking against libbfd to allow multiple versions of perf
being installed in parallel.
See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=606050
BugLink: http://bugs.launchpad.net/bugs/783660
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Stefan Bader [Thu, 11 Aug 2011 16:35:59 +0000 (11:35 -0500)]
UBUNTU: (config) Package macvlan and macvtap for virtual
Both drivers allow to set up virtual network interfaces which can be
used to set up containers within VMs.
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Colin Watson [Thu, 11 Aug 2011 00:01:53 +0000 (01:01 +0100)]
UBUNTU: Deliver more Atheros, Ralink, and iwlagn NIC drivers to d-i
d-i now supports WPA in Oneiric. While soliciting testing of this, I
heard from testers with Atheros, Ralink, and Intel AGN chipsets, none of
whom were able to test WPA support in d-i because the relevant drivers
weren't delivered to d-i.
This patch adds these drivers to nic-modules or nic-usb-modules as
appropriate.
Signed-off-by: Colin Watson <cjwatson@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Tim Gardner [Tue, 9 Aug 2011 17:00:18 +0000 (11:00 -0600)]
UBUNTU: [Config] Package x86_energy_perf_policy and turbostat
BugLink: http://bugs.launchpad.net/bugs/797556
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Tim Gardner [Tue, 9 Aug 2011 16:52:25 +0000 (10:52 -0600)]
UBUNTU: [Config] Clean up tools rules
There is no stem '$*' with which to match the automatic variable '%'.
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Tue, 9 Aug 2011 13:00:23 +0000 (14:00 +0100)]
UBUNTU: [Config] Enable CONFIG_MACVTAP=m
This options is still experimental but enables a separate network virtual
device. This can be used to optimise networks for KVM hosts.
BugLink: http://bugs.launchpad.net/bugs/822601
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Thu, 18 Aug 2011 15:11:05 +0000 (16:11 +0100)]
UBUNTU: [Config] standardise CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Leann Ogasawara [Tue, 16 Aug 2011 18:14:29 +0000 (11:14 -0700)]
UBUNTU: [Config] Temporarily disable CONFIG_VIDEO_OMAP2_VOUT on armel
drivers/media/video/omap/omap_vout.c:
In function 'omap_vout_probe': drivers/media/video/omap/omap_vout.c:2202:15:
error: 'struct omap_dss_driver' has no member named 'set_update_mode'
drivers/media/video/omap/omap_vout.c:2203:12:
error: 'struct omap_dss_driver' has no member named 'set_update_mode'
drivers/media/video/omap/omap_vout.c:2204:8:
error: 'OMAP_DSS_UPDATE_MANUAL' undeclared (first use in this function)
drivers/media/video/omap/omap_vout.c:2206:15:
error: 'struct omap_dss_driver' has no member named 'set_update_mode'
drivers/media/video/omap/omap_vout.c:2207:12:
error: 'struct omap_dss_driver' has no member named 'set_update_mode'
drivers/media/video/omap/omap_vout.c:2208:8:
error: 'OMAP_DSS_UPDATE_AUTO' undeclared (first use in this function)
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Tue, 16 Aug 2011 18:03:45 +0000 (11:03 -0700)]
UBUNTU: [Config] Temporarily disable CONFIG_CAN_TI_HECC on armel
drivers/net/can/ti_hecc.c: In function 'hecc_write_lam':
drivers/net/can/ti_hecc.c:244:2: error: implicit declaration of function '__raw_writel'
drivers/net/can/ti_hecc.c: In function 'hecc_read_mbx':
drivers/net/can/ti_hecc.c:256:2:error: implicit declaration of function '__raw_readl'
drivers/net/can/ti_hecc.c: In function 'ti_hecc_probe':
drivers/net/can/ti_hecc.c:898:2: error: implicit declaration of function 'ioremap'
drivers/net/can/ti_hecc.c:959:2: error: implicit declaration of function 'iounmap'
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Tue, 16 Aug 2011 17:52:49 +0000 (10:52 -0700)]
UBUNTU: [Config] Temporarily disable CONFIG_FTGMAC100 on armel
drivers/net/ftgmac100.c:981:1: error: unknown type name 'irqreturn_t'
drivers/net/ftgmac100.c: In function 'ftgmac100_interrupt':
drivers/net/ftgmac100.c:992:9: error: 'IRQ_HANDLED' undeclared (first use in this function)
drivers/net/ftgmac100.c: In function 'ftgmac100_open':
drivers/net/ftgmac100.c:1083:2: error: implicit declaration of function 'request_irq'
drivers/net/ftgmac100.c:1111:2: error: implicit declaration of function 'free_irq'
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Tue, 16 Aug 2011 17:27:24 +0000 (10:27 -0700)]
UBUNTU: [Config] Temporarily disable CONFIG_FTMAC100 on armel
drivers/net/ftmac100.c:856:1: error: unknown type name 'irqreturn_t'
drivers/net/ftmac100.c: In function 'ftmac100_interrupt':
drivers/net/ftmac100.c:867:9: error: 'IRQ_HANDLED' undeclared (first use in this function)
drivers/net/ftmac100.c: In function 'ftmac100_open':
drivers/net/ftmac100.c:961:2: error: implicit declaration of function 'request_irq'
drivers/net/ftmac100.c:984:2: error: implicit declaration of function 'free_irq'
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Tue, 16 Aug 2011 16:53:35 +0000 (09:53 -0700)]
UBUNTU: [Config] Diable INTEL_MID_PTI on armel
drivers/misc/pti.c:249:2:error: implicit declaration of function 'kmalloc'
drivers/misc/pti.c: In function 'pti_pci_remove':
drivers/misc/pti.c:410:3: error: implicit declaration of function 'pci_release_region'
drivers/misc/pti.c: In function 'pti_tty_install':
drivers/misc/pti.c:657:3: error: implicit declaration of function 'copy_from_user'
drivers/misc/pti.c: In function 'pti_pci_probe':
drivers/misc/pti.c:848:2: error: implicit declaration of function 'kzalloc'
drivers/misc/pti.c:859:2: error: implicit declaration of function 'pci_request_region'
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Mon, 15 Aug 2011 18:40:24 +0000 (11:40 -0700)]
UBUNTU: ubuntu: ndiswrapper -- remove netdev_priv macro
commit
e2270ea62ae4d7a47d6d72942cdb8c669be6357a
Author: David S. Miller <davem@davemloft.net>
Date: Tue Jul 12 10:37:21 2011 -0700
netdevice: Kill 'feature' test macros.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Mon, 15 Aug 2011 16:50:44 +0000 (09:50 -0700)]
UBUNTU: [Config] Updateconfigs after rebase to v3.1-rc2
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Mon, 15 Aug 2011 16:44:39 +0000 (09:44 -0700)]
UBUNTU: rebase to v3.1-rc2
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 12 Aug 2011 21:13:31 +0000 (14:13 -0700)]
UBUNTU: [Config] updateconfigs after rebase to v3.1-rc1
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 12 Aug 2011 19:29:06 +0000 (12:29 -0700)]
UBUNTU: rebase to v3.1-rc1
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Wed, 10 Aug 2011 22:48:20 +0000 (15:48 -0700)]
UBUNTU: Start new release
Ignore: yes
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Wed, 10 Aug 2011 20:45:24 +0000 (13:45 -0700)]
UBUNTU: Ubuntu-3.1.0-1.0
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>
Arjan van de Ven [Sun, 25 Oct 2009 22:37:04 +0000 (15:37 -0700)]
UBUNTU: SAUCE: (no-up) vfs: Add a trace point in the mark_inode_dirty function
[apw@canonical.com: This has no upstream traction but is used by powertop,
so its worth carrying.]
PowerTOP would like to be able to show who is keeping the disk
busy by dirtying data. The most logical spot for this is in the vfs
in the mark_inode_dirty() function. Doing this on the block level
is not possible because by the time the IO hits the block layer the
guilty party can no longer be found ("kjournald" and "pdflush" are not
useful answers to "who caused this file to be dirty).
The trace point follows the same logic/style as the block_dump code
and pretty much dumps the same data, just not to dmesg (and thus to
/var/log/messages) but via the trace events streams.
Note: This patch was posted to lkml and might potentially go into 2.6.33 but I
have not seen which maintainer will take it.
Signed-of-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Amit Kucheria <amit.kucheria@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 29 Jul 2010 08:46:41 +0000 (09:46 +0100)]
UBUNTU: SAUCE: (no-up) 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>
Miklos Szeredi [Thu, 4 Aug 2011 11:56:28 +0000 (13:56 +0200)]
UBUNTU: SAUCE: overlayfs -- fs: limit filesystem stacking depth
Add a simple read-only counter to super_block that indicates deep this
is in the stack of filesystems. Previously ecryptfs was the only
stackable filesystem and it explicitly disallowed multiple layers of
itself.
Overlayfs, however, can be stacked recursively and also may be stacked
on top of ecryptfs or vice versa.
To limit the kernel stack usage we must limit the depth of the
filesystem stack. Initially the limit is set to 2.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Neil Brown [Thu, 4 Aug 2011 11:56:28 +0000 (13:56 +0200)]
UBUNTU: SAUCE: overlayfs -- overlay: overlay filesystem documentation
Document the overlay filesystem.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Erez Zadok [Tue, 24 May 2011 00:59:20 +0000 (20:59 -0400)]
UBUNTU: SAUCE: overlayfs -- overlayfs: implement show_options
This is useful because of the stacking nature of overlayfs. Users like to
find out (via /proc/mounts) which lower/upper directory were used at mount
time.
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Fri, 1 Oct 2010 17:48:02 +0000 (18:48 +0100)]
UBUNTU: SAUCE: overlayfs -- overlayfs: add statfs support
Add support for statfs to the overlayfs filesystem. As the upper layer
is the target of all write operations assume that the space in that
filesystem is the space in the overlayfs. There will be some inaccuracy as
overwriting a file will copy it up and consume space we were not expecting,
but it is better than nothing.
Use the upper layer dentry and mount from the overlayfs root inode,
passing the statfs call to that filesystem.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Miklos Szeredi [Thu, 4 Aug 2011 11:56:28 +0000 (13:56 +0200)]
UBUNTU: SAUCE: overlayfs -- overlay filesystem
Overlayfs allows one, usually read-write, directory tree to be
overlaid onto another, read-only directory tree. All modifications
go to the upper, writable layer.
This type of mechanism is most often used for live CDs but there's a
wide variety of other uses.
The implementation differs from other "union filesystem"
implementations in that after a file is opened all operations go
directly to the underlying, lower or upper, filesystems. This
simplifies the implementation and allows native performance in these
cases.
The dentry tree is duplicated from the underlying filesystems, this
enables fast cached lookups without adding special support into the
VFS. This uses slightly more memory than union mounts, but dentries
are relatively small.
Currently inodes are duplicated as well, but it is a possible
optimization to share inodes for non-directories.
Opening non directories results in the open forwarded to the
underlying filesystem. This makes the behavior very similar to union
mounts (with the same limitations vs. fchmod/fchown on O_RDONLY file
descriptors).
Usage:
mount -t overlay -olowerdir=/lower,upperdir=/upper overlay /mnt
Supported:
- all operations
Missing:
- ensure that filesystems part of the overlay are not modified outside
the overlay
The following cotributions have been folded into this patch:
Neil Brown <neilb@suse.de>:
- minimal remount support
- use correct seek function for directories
- initialise is_real before use
- rename ovl_fill_cache to ovl_dir_read
Felix Fietkau <nbd@openwrt.org>:
- fix a deadlock in ovl_dir_read_merged
- fix a deadlock in ovl_remove_whiteouts
Erez Zadok <ezk@fsl.cs.sunysb.edu>
- fix cleanup after WARN_ON
Also thanks to the following people for testing and reporting bugs:
Jordi Pujol <jordipujolp@gmail.com>
Andy Whitcroft <apw@canonical.com>
Michal Suchanek <hramrach@centrum.cz>
Felix Fietkau <nbd@openwrt.org>
Erez Zadok <ezk@fsl.cs.sunysb.edu>
Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Miklos Szeredi [Wed, 1 Jun 2011 08:57:14 +0000 (10:57 +0200)]
UBUNTU: SAUCE: overlayfs -- vfs: introduce clone_private_mount()
Overlayfs needs a private clone of the mount, so create a function for
this and export to modules.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Miklos Szeredi [Wed, 1 Jun 2011 08:57:14 +0000 (10:57 +0200)]
UBUNTU: SAUCE: overlayfs -- vfs: export do_splice_direct() to modules
Export do_splice_direct() to modules. Needed by overlay filesystem.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Miklos Szeredi [Wed, 1 Jun 2011 08:57:14 +0000 (10:57 +0200)]
UBUNTU: SAUCE: overlayfs -- vfs: add i_op->open()
Add a new inode operation i_op->open(). This is for stacked
filesystems that want to return a struct file from a different
filesystem.
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Leann Ogasawara [Mon, 30 May 2011 23:35:15 +0000 (16:35 -0700)]
UBUNTU: ubuntu: dm-raid4-5 fix up build failure
ubuntu-2.6/ubuntu/dm-raid4-5/dm-raid4-5.c:1579:9: error: too many
arguments to function 'dm_io_client_create'
The above build failure was a result of upstream commit:
commit
bda8efec5c706a672e0714d341a342e811f0262a
Author: Mikulas Patocka <mpatocka@redhat.com>
Date: Sun May 29 13:03:09 2011 +0100
dm io: use fixed initial mempool size
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Stefan Bader [Thu, 26 May 2011 11:19:57 +0000 (13:19 +0200)]
UBUNTU: SAUCE: Convert dm-raid45 to new block plugging
Plugging for IOs to block devices was changed to an explicit, per task
base. This converts the module to the new framework, fixing the compile
failure.
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Robert Nelson [Tue, 26 Apr 2011 05:12:11 +0000 (02:12 -0300)]
UBUNTU: SAUCE: omap3: beagle: if rev unknown, assume xM revision C
BugLink: http://bugs.launchpad.net/bugs/770679
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Robert Nelson [Tue, 26 Apr 2011 04:59:58 +0000 (01:59 -0300)]
UBUNTU: SAUCE: omap3: beagle: detect new xM revision B
The xM B uses a DM3730 ES1.1 over the ES1.0 on xM A's, no other board changes.
BugLink: http://bugs.launchpad.net/bugs/770679
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Ingo Molnar [Wed, 14 Jul 2010 07:55:23 +0000 (00:55 -0700)]
UBUNTU: ubuntu: nx-emu - i386: mmap randomization for executable mappings
This code is originally from Ingo Molnar, with some later rebasing and
fixes to respect all the randomization-disabling knobs. It provides
address randomization algorithm when NX emulation is in use in 32-bit
processes. Kees Cook pushed the brk area further away in the case of PIE
binaries landing their brk inside the CS limit.
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Ingo Molnar [Wed, 14 Jul 2010 07:50:02 +0000 (00:50 -0700)]
UBUNTU: ubuntu: nx-emu - i386: NX emulation
This is old code with some cruft, all originally by Ingo Molnar with
much later rebasing by Fedora folks and at least one arcane fix by
Roland McGrath a few years ago. No longer uses exec-shield sysctl,
merged with disable_nx. Kees Cook fixed boottime NX reporting for various
corner cases.
Signed-off-by: Kees Cook <kees.cook@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Colin Ian King [Mon, 23 May 2011 14:06:50 +0000 (15:06 +0100)]
UBUNTU: SAUCE: S3 early resume debug via keyboard LEDs
Add support to debug S3 early resume by flashing the keyboard
LEDs three times in the realmode path. This is useful to allow
one to determine if S3 hangs occur in the BIOS or during the early
resume phase.
Add kernel parameter acpi_sleep=s3_leds to enable the s3 debugging
option. This can also be enabled by writing 8 to
/proc/sys/kernel/acpi_video_flags.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Thomas Schlichter [Thu, 19 May 2011 13:44:05 +0000 (14:44 +0100)]
UBUNTU: SAUCE: vesafb: enable mtrr WC by default
BugLink: http://bugs.launchpad.net/bugs/778043
Move to enabling a write-combining MTRR by default, this then matches
the uvesafb module.
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Thomas Schlichter [Thu, 19 May 2011 13:42:26 +0000 (14:42 +0100)]
UBUNTU: SAUCE: vesafb: mtrr module parameter is uint, not bool
BugLink: http://bugs.launchpad.net/bugs/778043
As noted by the reporter the mtrr kernel command line option is actually a
positive numeric not a boolean, move the module parameter we add to match.
Acked-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Leann Ogasawara [Tue, 17 May 2011 16:12:04 +0000 (09:12 -0700)]
UBUNTU: ubuntu: rfkill disable driver
Per UDS-O discussions, it is unsure why we are still carrying this
driver. The plan is to disable during the O development cycle and
see if anyone notices. If no one objects, we'll drop the driver
completely in the P LTS release.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Tue, 17 May 2011 16:11:12 +0000 (09:11 -0700)]
UBUNTU: ubuntu: omnibook disable driver
Per UDS-O discussions, it is unsure why we are still carrying this
driver. The plan is to disable during the O development cycle and see
if anyone notices. If no one objects, we'll drop the driver completely
in the P LTS release.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Thu, 5 May 2011 13:51:39 +0000 (06:51 -0700)]
UBUNTU: SAUCE: [arm] fixup __aeabi_uldivmod undefined build error
When building on arm we run into the following build error due to
gcc-4.6 optimizing do_div into a uldivmod call:
ERROR: "__aeabi_uldivmod" [drivers/scsi/megaraid/megaraid_sas.ko] undefined!
Inline some assembly to prevent the compiler optimization.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Thu, 7 Apr 2011 13:41:10 +0000 (06:41 -0700)]
UBUNTU: (no-up) Update dropped.txt for Oneiric
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Kamal Mostafa [Tue, 1 Feb 2011 20:36:11 +0000 (12:36 -0800)]
UBUNTU: ubuntu: omnibook: fix source file newline
Add missing final newline to avoid dpkg-source warning.
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Ricardo Salveti de Araujo [Fri, 28 Jan 2011 04:10:37 +0000 (02:10 -0200)]
UBUNTU: SAUCE: omap3: beaglexm: fix DVI initialization
Function beagle_twl_gpio_setup is called after beagle_display_init, what
makes lets reset_gpio with an invalid value at the time it request the
gpio. As a side effect the DVI reset GPIO is not properly set.
Also removing old code that power down DVI in a hardcoded way, as it's
not necessary anymore.
Tested with Beagle-xM and C4.
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Yong Zhang [Mon, 24 Jan 2011 00:59:17 +0000 (00:59 +0000)]
sched: tg->se->load should be initialised to tg->shares
Michael reported that when enable autogroup on UP, system
responsiveness becomes very bad.
Because in init_tg_cfs_entry() we initialise se->load
to 0 instead of tg->shares, in the end we have 0-weight
sched entity on rq, then lead to misbehavior.
Reported-by: Michael Witten <mfwitten@gmail.com>
Reported-by: Christian Kujau <christian@nerdbynature.de>
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Mon, 17 Jan 2011 14:14:18 +0000 (14:14 +0000)]
UBUNTU: ubuntu: ndiswrapper -- fix interaction between __packed and packed
Andy Whitcroft [Thu, 9 Dec 2010 12:42:25 +0000 (12:42 +0000)]
UBUNTU: ubuntu: ndiswrapper -- follow removal of the BKL and locked ioctl
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 9 Dec 2010 12:12:18 +0000 (12:12 +0000)]
UBUNTU: ubuntu: ndiswrapper -- update BOM to match actual version
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 9 Dec 2010 11:56:11 +0000 (11:56 +0000)]
UBUNTU: ubuntu: omnibook -- update BOM
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 8 Dec 2010 20:29:46 +0000 (20:29 +0000)]
UBUNTU: ubuntu: dm-raid4-5 -- follow changes to bio flags
commit
7b6d91daee5cac6402186ff224c3af39d79f4a0e
Author: Christoph Hellwig <hch@lst.de>
Date: Sat Aug 7 18:20:39 2010 +0200
block: unify flags for struct bio and struct request
Follow the following transitions:
bio_rw_flagged(bio, BIO_RW_BARRIER)) ->
(bio->bi_rw & REQ_HARDBARRIER) ->
(bio->bi_rw & REQ_FLUSH)
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 3 Dec 2010 09:51:33 +0000 (09:51 +0000)]
UBUNTU: (no-up) add support for installed header files to ubuntu directory
BugLink: http://bugs.launchpad.net/bugs/684666
We need the aufs headers in the linux-libc-headers, add support for
including files from the ubuntu include directory.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Tue, 23 Nov 2010 16:38:55 +0000 (16:38 +0000)]
UBUNTU: (no-up): document the new ## scheme
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Fri, 12 Nov 2010 16:57:18 +0000 (16:57 +0000)]
Revert "mmc: fix all hangs related to mmc/sd card insert/removal during suspend/resume"
This reverts commit
93cddb91e1a94859adfd99982b47da8328c3cfc1.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Manoj Iyer [Mon, 6 Apr 2009 15:58:49 +0000 (10:58 -0500)]
UBUNTU: SAUCE: Added quirk to recognize GE0301 3G modem as an interface.
OriginalAuthor: Timo Aaltonen <tjaalton@ubuntu.com>
BugLink: http://bugs.launchpad.net/bugs/348861
Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Andy Whitcroft [Thu, 29 Jul 2010 15:48:21 +0000 (16:48 +0100)]
UBUNTU: SAUCE: drm -- stop early access to drm devices
When a drm driver is initialised we first allocate and initialise the
drm minor numbers including creating the sysfs files, then we trigger
the driver load method. The act of creating the sysfs files triggers the
uevent. This means udev may start programs which open /dev/dri/card0 and
other interfaces, this can occur before the load method has even started
and thus before the driver has fully initialised its data structures.
In the case of plymouthd this leads to it opening and closing (in disgust)
the interface, which in turn leads to a kernel panic as the mutexes are
yet to be initialised.
This patch delays the linking up of the drm devices minor numbers until
the driver is fully initialised. As it is possible for consumers of
these interfaces to reach them before they are fully initialised we
arrange for opens of these devices to return EAGAIN until the device is
fully initialised.
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>
John Johansen [Mon, 1 Nov 2010 22:16:54 +0000 (18:16 -0400)]
UBUNTU: SAUCE: AppArmor: Fix unpack of network tables.
The unpacking of network rules, unpacks 1 more rule than it should. It
should drop all rules with network types AF_MAX or greater.
Fix suggested by Tetsuo Handa in
https://lists.ubuntu.com/archives/kernel-team/2010-November/013327.html
Reported-by: Tetsuo Handa <from-ubuntu@I-love.SAKURA.ne.jp>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
John Johansen [Thu, 22 Jul 2010 09:32:02 +0000 (02:32 -0700)]
AppArmor: compatibility patch for v5 interface
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
John Johansen [Mon, 4 Oct 2010 22:03:36 +0000 (15:03 -0700)]
AppArmor: compatibility patch for v5 network controll
Add compatibility for v5 network rules.
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Fri, 22 Oct 2010 20:11:56 +0000 (14:11 -0600)]
UBUNTU: (no-up) [Config] Note dropped SAUCE patches from 2.6.36 to 2.6.37
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Tim Gardner [Wed, 22 Sep 2010 10:22:53 +0000 (18:22 +0800)]
UBUNTU: (no-up) 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: (no-up) Added dropped patch list
Signed-off-by: Tim Gardner <tim.gardner@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>
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>
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 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 [Fri, 16 Jul 2010 08:37:31 +0000 (09:37 +0100)]
UBUNTU: SAUCE: (no-up) 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>
Nicolas Pitre [Tue, 13 Jul 2010 04:58:12 +0000 (00:58 -0400)]
UBUNTU: ubuntu: 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>
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, 3 Jun 2010 20:34:15 +0000 (13:34 -0700)]
UBUNTU: ubuntu: 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>
Leann Ogasawara [Thu, 3 Jun 2010 03:42:24 +0000 (20:42 -0700)]
UBUNTU: ubuntu: 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>
Tim Gardner [Wed, 19 May 2010 15:17:26 +0000 (09:17 -0600)]
UBUNTU: ubuntu: 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>
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>
Leann Ogasawara [Wed, 14 Apr 2010 15:27:05 +0000 (08:27 -0700)]
UBUNTU: ubuntu: dm-raid4-5 -- update to compile with 2.6.34-rc4
Need to include linux/slab.h to prevent implicit declaration of
functions which otherwise result in build failures.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Fri, 26 Mar 2010 22:15:51 +0000 (15:15 -0700)]
UBUNTU: ubuntu: dm-raid4-5 -- update to compile with 2.6.34-rc2
The following commit removes unused params from dm_get_device().
Convert dm-raid4-5 to match:
commit
8215d6ec5fee1e76545decea2cd73717efb5cb42
Author: Nikanth Karthikesan <knikanth@novell.com>
Date: Sat Mar 6 02:32:27 2010 +0000
dm table: remove unused dm_get_device range parameters
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Leann Ogasawara [Wed, 24 Mar 2010 17:36:13 +0000 (10:36 -0700)]
UBUNTU: ubuntu: dm-raid4-5 -- update to compile with 2.6.33
The following commit adds a fn callback arguement to dm_dirty_log_create().
convert dm-raid4-5 to match:
commit
87a8f240e9bcf025ba45e4563c842b0d59c5e8ef
Author: Mikulas Patocka <mpatocka@redhat.com>
Date: Thu Dec 10 23:52:01 2009 +0000
dm log: add flush callback fn
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Andy Whitcroft [Thu, 11 Mar 2010 10:33:36 +0000 (10:33 +0000)]
UBUNTU: SAUCE: (no-up) cdrom -- default to not locking the tray when in use
BugLink: http://bugs.launchpad.net/bugs/397734
It seems that users are have a high expectation that the eject button
on their CDROM drive will eject the disk regardless of whether it is in
use or not. To this end we are now changing the default LOCK mode for
mounted CDROMS to 0 to allow ejects. This however does not handle the
direct open cases like music and video players. From the launchpad bug
commentary:
So, according to the upstream discussion David Zeuthen recommended
to just not lock CD-ROM trays by default. Kernel/userspace already
handles prematurely removed USB storage devices reasonably, and with
read-only devices like CD-ROMs it is even less of an issue. So we
should just set /proc/sys/dev/cdrom/lock to 0 by default.
Note that we still will have the drive mounted after the eject. There is a
media change uevent generated and this will be used to trigger the unmount
of the drive in udisks. The burner software will also have to be looked
at to ensure they are explicitly locking the drive closed during the burn.
This will all be handled under the bug above.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Colin King <colin.king@canonical.com>
Manoj Iyer [Fri, 18 Dec 2009 00:57:47 +0000 (01:57 +0100)]
UBUNTU: SAUCE: (no-up) PM report driver and device suspend/resume times.
Based on a patch from Rafael J. Wysocki. This patch prints suspend/resume
information for each driver/device to dmesg.
[apw@canonical.com: rejigged to split config updates]
[apw@canonical.com: move the configuration item fix build when full PM
is not enabled]
Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Colin Watson [Thu, 25 Feb 2010 13:23:30 +0000 (13:23 +0000)]
UBUNTU: ubuntu: fsam7400: Depend on CHECK_SIGNATURE
Needed so that 'make defconfig && make' works.
Signed-off-by: Colin Watson <cjwatson@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Colin Watson [Thu, 25 Feb 2010 13:21:02 +0000 (13:21 +0000)]
UBUNTU: ubuntu: dm-raid4-5: Depend on XOR_BLOCKS
Needed so that 'make defconfig && make' works.
Signed-off-by: Colin Watson <cjwatson@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 17 Feb 2010 10:13:42 +0000 (10:13 +0000)]
UBUNTU: SAUCE: khubd -- switch USB product/manufacturer/serial handling to RCU
BugLink: http://bugs.launchpad.net/bugs/510937
With the introduction of wireless USB hubs the product, manufacturer,
and serial number are now mutable. This necessitates new locking in the
consumers of these values including the sysfs read routines in order to
prevent use-after-free acces to these values. These extra locks create
significant lock contention leading to increased boot times (0.3s for an
example Atom based system). Move update of these values to RCU based
locking.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andi Kleen [Sat, 23 Jan 2010 11:33:59 +0000 (12:33 +0100)]
x86, mce: Make xeon75xx memory driver dependent on PCI
commit
757fd770c649b0dfa6eeefc2d5e2ea3119b6be9c upstream (linux-2.6-tip)
Found by Ingo Molnar's automated tester.
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
LKML-Reference: <
20100123113359.GA29555@one.firstfloor.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
H. Peter Anvin [Fri, 22 Jan 2010 02:31:54 +0000 (18:31 -0800)]
x86, mce: Rename cpu_specific_poll to mce_cpu_specific_poll
commit
f91c4d2649531cc36e10c6bc0f92d0f99116b209 upstream (linux-2.6-tip)
cpu_specific_poll is a global variable, and it should have a global
namespace name. Since it is MCE-specific (it takes a struct mce *),
rename it mce_cpu_specific_poll.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Andi Kleen <andi@firstfloor.org>
LKML-Reference: <
20100121221711.GA8242@basil.fritz.box>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andi Kleen [Thu, 21 Jan 2010 22:17:12 +0000 (23:17 +0100)]
x86, mce: Xeon75xx specific interface to get corrected memory error information
commit
c773f70fd6b53ee646727f871833e53649907264 upstream (linux-2.6-tip)
Xeon 75xx doesn't log physical addresses on corrected machine check
events in the standard architectural MSRs. Instead the address has to
be retrieved in a model specific way. This makes it impossible to do
predictive failure analysis.
Implement cpu model specific code to do this in mce-xeon75xx.c using a
new hook that is called from the generic poll code. The code retrieves
the physical address/DIMM of the last corrected error from the
platform and makes the address look like a standard architectural MCA
address for further processing.
In addition the DIMM information is retrieved and put into two new
aux0/aux1 fields in struct mce. These fields are specific to a given
CPU. These fields can then be decoded by mcelog into specific DIMM
information. The latest mcelog version has support for this.
Longer term this will be likely in a different output format, but
short term that seemed like the least intrusive solution. Older mcelog
can deal with an extended record.
There's no code to print this information on a panic because this only
works for corrected errors, and corrected errors do not usually result
in panics.
The act of retrieving the DIMM/PA information can take some time, so
this code has a rate limit to avoid taking too much CPU time on a
error flood.
The whole thing can be loaded as a module and has suitable PCI-IDs so
that it can be auto-loaded by a distribution. The code also checks
explicitely for the expected CPU model number to make sure this code
doesn't run anywhere else.
Signed-off-by: Andi Kleen <ak@linux.intel.com>
LKML-Reference: <
20100121221711.GA8242@basil.fritz.box>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Eric Miao [Mon, 25 Jan 2010 13:52:37 +0000 (21:52 +0800)]
UBUNTU: (no-up) arm -- enable ubuntu/ directory
Signed-off-by: Eric Miao <eric.miao@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Eric Miao [Wed, 27 Jan 2010 04:02:24 +0000 (04:02 +0000)]
UBUNTU: SAUCE: (no-up) Make CONFIG_{OMNIBOOK, AVERATEC_5100P, PACKARDBELL_E5} depend on X86
There options are really X86 specific, and the source won't compile on
ARM platforms. Make them depend on X86 and less confusing when syncing
config options to ARM.
Signed-off-by: Eric Miao <eric.miao@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Thu, 24 Dec 2009 02:09:03 +0000 (02:09 +0000)]
UBUNTU: SAUCE: acpi battery -- move first lookup asynchronous
BugLink: http://bugs.launchpad.net/bugs/507211
When instantiating the battery object on to the acpi bus in the kernel
we talk to the BIOS to get the current battery state. This can take
a long time and holds the acpi bus object locked for the duration.
This leads to any other object wishing to add itself that bus blocking.
This leads to unpredicatable delays of up to .3s when initialising the
hpet during boot depending on execution order. Make the first update of
the battery asynchronous. Move the acpi bus handling back synchronous.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Andy Whitcroft [Wed, 23 Dec 2009 16:43:07 +0000 (16:43 +0000)]
UBUNTU: SAUCE: async_populate_rootfs: move rootfs init earlier
Check to see if the machine has more than one active CPU, if it does
then it is worth starting the decode of the rootfs earlier.
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Manoj Iyer [Thu, 10 Dec 2009 18:13:15 +0000 (12:13 -0600)]
UBUNTU: ubuntu: omnibook -- Added missing BOM file
Forgot to add BOM file when I added omnibook module to ubuntu/
this patch adds it.
Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>