aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-25UBUNTU: ubuntu: dm-raid4-5 fix up build failureLeann Ogasawara
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>
2012-06-25UBUNTU: SAUCE: Convert dm-raid45 to new block pluggingStefan Bader
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>
2012-06-25UBUNTU: SAUCE: S3 early resume debug via keyboard LEDsColin Ian King
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>
2012-06-25UBUNTU: SAUCE: vesafb: enable mtrr WC by defaultThomas Schlichter
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>
2012-06-25UBUNTU: SAUCE: vesafb: mtrr module parameter is uint, not boolThomas Schlichter
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>
2012-06-25UBUNTU: SAUCE: [arm] fixup __aeabi_uldivmod undefined build errorLeann Ogasawara
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>
2012-06-25UBUNTU: ubuntu: dm-raid4-5 -- follow changes to bio flagsAndy Whitcroft
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>
2012-06-25UBUNTU: (no-up) add support for installed header files to ubuntu directoryAndy Whitcroft
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>
2012-06-25Revert "mmc: fix all hangs related to mmc/sd card insert/removal during ↵Andy Whitcroft
suspend/resume" This reverts commit 93cddb91e1a94859adfd99982b47da8328c3cfc1. Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: SAUCE: Added quirk to recognize GE0301 3G modem as an interface.Manoj Iyer
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>
2012-06-25UBUNTU: SAUCE: drm -- stop early access to drm devicesAndy Whitcroft
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>
2012-06-25UBUNTU: SAUCE: Improve Amazon EBS performance for EC2John Johansen
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>
2012-06-25UBUNTU: SAUCE: (no-up) ARM: Resetting power_mode to its original value.Mathieu J. Poirier
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>
2012-06-25UBUNTU: SAUCE: (no-up) Modularize vesafb -- fix initialisationAndy Whitcroft
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>
2012-06-25UBUNTU: SAUCE: (no-up) Stop ARM boards crashing when CUPS is loadedLee Jones
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>
2012-06-25UBUNTU: SAUCE: fix build error with CONFIG_BLK_DEV_INITRD=nTim Gardner
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>
2012-06-25UBUNTU: SAUCE: add option to hand off all kernel parameters to initAndy Whitcroft
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>
2012-06-25UBUNTU: SAUCE: (no-up) dma-mapping: Remove WARN_ON in dma_free_coherentStefan Bader
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>
2012-06-25UBUNTU: ubuntu: dm-raid4-5 -- update to compile with 2.6.34-rc4Leann Ogasawara
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>
2012-06-25UBUNTU: ubuntu: dm-raid4-5 -- update to compile with 2.6.34-rc2Leann Ogasawara
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>
2012-06-25UBUNTU: ubuntu: dm-raid4-5 -- update to compile with 2.6.33Leann Ogasawara
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>
2012-06-25UBUNTU: SAUCE: (no-up) cdrom -- default to not locking the tray when in useAndy Whitcroft
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>
2012-06-25UBUNTU: SAUCE: (no-up) PM report driver and device suspend/resume times.Manoj Iyer
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>
2012-06-25UBUNTU: ubuntu: dm-raid4-5: Depend on XOR_BLOCKSColin Watson
Needed so that 'make defconfig && make' works. Signed-off-by: Colin Watson <cjwatson@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: SAUCE: khubd -- switch USB product/manufacturer/serial handling to RCUAndy Whitcroft
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>
2012-06-25x86, mce: Make xeon75xx memory driver dependent on PCIAndi Kleen
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>
2012-06-25x86, mce: Rename cpu_specific_poll to mce_cpu_specific_pollH. Peter Anvin
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>
2012-06-25x86, mce: Xeon75xx specific interface to get corrected memory error informationAndi Kleen
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>
2012-06-25UBUNTU: SAUCE: acpi battery -- move first lookup asynchronousAndy Whitcroft
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>
2012-06-25UBUNTU: SAUCE: async_populate_rootfs: move rootfs init earlierAndy Whitcroft
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>
2012-06-25UBUNTU: SAUCE: isapnp_init: make isa PNP scans occur asyncAndy Whitcroft
The results of scanning for devices is to trigger udev events therefore we can push this processing async. This reduces kernel initialisation time (the time from bootloader to starting userspace) by several 10ths of a second x86 32bit systems. Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: SAUCE: Make populate_rootfs asynchronousSurbhi Palande
The expansion of the initramfs is completely independant of other boot activities. The original data is already present at boot and the filesystem is not required until we are ready to start init. It is therefore reasonable to populate the rootfs asynchronously. Move this processing to an async call. This reduces kernel initialisation time (the time from bootloader to starting userspace) by several 10ths of a second on a selection of test hardware particularly SMP systems, although UP system also benefit. Signed-off-by: Surbhi Palande <surbhi.palande@canonical.com> Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) set /proc/acpi/video/*/DOS to 4 by defaultAndy Whitcroft
BugLink: http://bugs.launchpad.net/bugs/458982 acpi_video_bus_start_devices() in drivers/acpi/video.c sets the default ACPI DOS value to 0, which lets the OS handle toggling of display output but still leaves the BIOS handling brightness levels automatically when connecting/disconnecting AC. We want the OS to handle both where possible, so a better default would be to set this to 4. This likely will regress systems using proprietary video drivers which will need to change this setting back using the sysfs interfaces. Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) trace: add trace events for open(), exec() and uselib()Scott James Remnant
BugLink: http://bugs.launchpad.net/bugs/462111 This patch uses TRACE_EVENT to add tracepoints for the open(), exec() and uselib() syscalls so that ureadahead can cheaply trace the boot sequence to determine what to read to speed up the next. It's not upstream because it will need to be rebased onto the syscall trace events whenever that gets merged, and is a stop-gap. Signed-off-by: Scott James Remnant <scott@ubuntu.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) raise the default console 'quiet' level to 2Tim Gardner
In the interests of providing a clean boot experience, i.e., a blank screen before X starts, supress noisy driver messages. See https://lists.ubuntu.com/archives/kernel-team/2009-October/007476.html for the original diatribe. Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-25UBUNTU: ubuntu: dm-raid-45 -- update to compile with 2.6.32Andy Whitcroft
This commit changed bio_barrier() to direct flag accessors, convert dm-raid-4-5 to match: commit 1f98a13f623e0ef666690a18c1250335fc6d7ef1 Author: Jens Axboe <jens.axboe@oracle.com> Date: Fri Sep 11 14:32:04 2009 +0200 bio: first step in sanitizing the bio->bi_rw flag testing Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) disable adding scsi headers to linux-libc-devAndy Whitcroft
Currently scsi headers are generated by the kernel and by libc6-dev. We need to coordinate any switch over to the kernel. Temporarily disabled these headers in the kernel package. Signed-off-by: Andy Whitcroft <apw@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) Sony laptop: Some Sony Vaia laptops do not enable ↵Tim Gardner
wwan power by default. Bug: https://bugs.launchpad.net/bugs/364678 Added quirk to enable wwan power based on DMI information already present in the module. Ity appears that Vaio's do not enable power to wwan from a cold boot. We'll carry this patch indefinitely. Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) nbd: Change default partitions per device to 15Scott James Remnant
This was previously changed by using an "options" line in a modprobe.d file, however that practice is now deprecated. This is because module names, option names, their values and even their current defaults can all change inside the kernel and module-init-tools has never been kept in sync. In addition, changing the kernel means that the option change will apply if the module is built in by users or the OEM team. Bug: #342563 Signed-off-by: Scott James Remnant <scott@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) hostap: Change initial operation mode to managed (infra)Scott James Remnant
This was previously changed by using an "options" line in a modprobe.d file, however that practice is now deprecated. This is because module names, option names, their values and even their current defaults can all change inside the kernel and module-init-tools has never been kept in sync. In addition, changing the kernel means that the option change will apply if the module is built in by users or the OEM team. Signed-off-by: Scott James Remnant <scott@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) version: Implement version_signature proc file.Andy Whitcroft
Signed-off-by: Andy Whitcroft <apw@canonical.com> Acked-by: Tim Gardener <tim.gardner@canonical.com>
2012-06-25UBUNTU: SAUCE: (no-up) Modularize vesafbBen Collins
Signed-off-by: Ben Collins <ben.collins@canonical.com>
2012-06-25UBUNTU: ubuntu: dm-raid45 -- version 2009.04.24 (2.6.30-rc3)Manoj Iyer
ExternalDriver: dm-raid45 Description: This software extends device-mapper by RAID4 and RAID5 mappings. Url: http://people.redhat.com/~heinzm/sw/dm/dm-raid45/ Version: 2009.04.24 (2.6.30-rc3) Signed-off-by: Manoj Iyer <manoj.iyer@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
2012-06-25UBUNTU: ubuntu: dm-raid4-5 -- (no-up) Export dm_disk function of device-mapperStefan Bader
This function is externally used by the dm-raid4-5 module. Signed-off-by: Stefan Bader <stefan.bader@canonical.com> Signed-off-by: Ben Collins <ben.collins@canonical.com>
2012-06-25SAUCE only changes from 416c4af UBUNTU: (no-up) fold down debian for ↵Leann Ogasawara
ubuntu-q v3.5-rc1 rebase Signed-off-by: John Rigby <john.rigby@linaro.org>
2012-06-16Linux 3.5-rc3Linus Torvalds
2012-06-16Merge branch 'for-linus' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs compile warning fixes from Chris Mason. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: cast devid to unsigned long long for printk %llu Btrfs: init old_generation in get_old_root
2012-06-16Merge branch 'stable' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile Pull arch/tile update from Chris Metcalf: "This one-line bug fix unbreaks glibc robust mutexes (among other things no doubt), from code merged in during the 3.5 merge window but which we had been running internally at Tilera for almost a year." * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: tile: fix bug in get_user() for 4-byte values
2012-06-16Merge tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6Linus Torvalds
Pull fbdev fixes from Florian Tobias Schandinat: - two fixes for s3c-fb by Jingoo Han (including a fix for a potential division by zero) - a couple of randconfig fixes by Arnd Bergmann - a cleanup for bfin_adv7393fb by Emil Goode * tag 'fbdev-fixes-for-3.5-1' of git://github.com/schandinat/linux-2.6: video: s3c-fb: fix possible division by zero in s3c_fb_calc_pixclk video: s3c-fb: clear SHADOWCON register when clearing hardware window registers drivers/tosa: driver needs I2C and SPI to compile drivers/savagefb: use mdelay instead of udelay video/console: automatically select a font video/ili9320: do not mark exported functions __devexit drivers/video: use correct __devexit_p annotation video: bfin_adv7393fb: Convert to kstrtouint_from_user
2012-06-16tile: fix bug in get_user() for 4-byte valuesChris Metcalf
The definition of 32-bit values in the 64-bit tilegx architecture is that they should be sign-extended regardless of whether they are considered signed or unsigned by the compiler. Accordingly, we need to use an "ld4s" rather than "ld4u" to load and sign-extend for get_user(). This fixes glibc bug 14238 (see http://sourceware.org/bugzilla), introduced during the 3.5 merge window. Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>