debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Regenerate some patches that have gone upstream 

svn path=/dists/sid/linux-2.6/; revision=19007
This commit is contained in:
Ben Hutchings 2012-05-17 01:51:19 +00:00
parent fefce7f637
commit c2af7fa4cc
4 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
debian/patches/bugfix/all/snapshot-Implement-compat_ioctl.patch vendored
View File

@ -1,15 +1,21 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Tue, 27 Dec 2011 20:42:09 +0100
Subject: [PATCH] snapshot: Implement compat_ioctl
Date: Tue, 27 Dec 2011 22:54:52 +0100
Subject: [PATCH] PM / Hibernate: Implement compat_ioctl for /dev/snapshot
commit c336078bf65c4d38caa9a4b8b7b7261c778e622c upstream.
This allows uswsusp built for i386 to run on an x86_64 kernel (tested
with Debian package version 1.0+20110509-2).
References: http://bugs.debian.org/502816
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
kernel/power/user.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 64 insertions(+), 0 deletions(-)
1 file changed, 64 insertions(+)
diff --git a/kernel/power/user.c b/kernel/power/user.c
index 6d8f535..d86e5a7 100644
index 78bdb44..6b1ab7a 100644
--- a/kernel/power/user.c
+++ b/kernel/power/user.c
@@ -21,6 +21,7 @@
@ -20,7 +26,7 @@ index 6d8f535..d86e5a7 100644
#include <linux/console.h>
#include <linux/cpu.h>
#include <linux/freezer.h>
@@ -464,6 +465,66 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
@@ -380,6 +381,66 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd,
return error;
}
@ -87,7 +93,7 @@ index 6d8f535..d86e5a7 100644
static const struct file_operations snapshot_fops = {
.open = snapshot_open,
.release = snapshot_release,
@@ -471,6 +532,9 @@ static const struct file_operations snapshot_fops = {
@@ -387,6 +448,9 @@ static const struct file_operations snapshot_fops = {
.write = snapshot_write,
.llseek = no_llseek,
.unlocked_ioctl = snapshot_ioctl,
@ -98,5 +104,5 @@ index 6d8f535..d86e5a7 100644
static struct miscdevice snapshot_device = {
--
1.7.7.3
1.7.10

16
debian/patches/bugfix/arm/ARM-orion5x-Fix-GPIO-enable-bits-for-MPP9.patch vendored
View File

@ -1,17 +1,21 @@
From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 7 Apr 2012 04:57:36 +0100
Date: Sun, 8 Apr 2012 05:18:53 +0100
Subject: [PATCH] ARM: orion5x: Fix GPIO enable bits for MPP9
Commit 554cdaefd1cf7bb54b209c4e68c7cec87ce442a9 seems to have
accidentally inverted the GPIO valid bits for MPP9 (only). For the
mv2120 platform which uses MPP9 as a GPIO LED device, this results in
the error:
commit 48d99f47a81a66bdd61a348c7fe8df5a7afdf5f3 upstream.
Commit 554cdaefd1cf7bb54b209c4e68c7cec87ce442a9 ('ARM: orion5x: Refactor
mpp code to use common orion platform mpp.') seems to have accidentally
inverted the GPIO valid bits for MPP9 (only). For the mv2120 platform
which uses MPP9 as a GPIO LED device, this results in the error:
[ 12.711476] leds-gpio: probe of leds-gpio failed with error -22
Reported-by: Henry von Tresckow <hvontres@gmail.com>
References: http://bugs.debian.org/667446
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Tested-by: Hans Henry von Tresckow <hvontres@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
---
arch/arm/mach-orion5x/mpp.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
@ -32,5 +36,5 @@ index eac6897..db70e79 100644
#define MPP10_UNUSED MPP(10, 0x0, 0, 0, 1, 1, 1)
#define MPP10_GPIO MPP(10, 0x0, 1, 1, 1, 1, 1)
--
1.7.9.5
1.7.10

9
debian/patches/bugfix/arm/ARM-topdown-mmap.patch vendored
View File

@ -1,10 +1,9 @@
http://ftp.arm.linux.org.uk/git/gitweb.cgi?p=linux-2.6-arm.git;a=commit;h=7dbaa466780a754154531b44c2086f6618cee3a8
From 7dbaa466780a754154531b44c2086f6618cee3a8 Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Tue, 22 Nov 2011 04:01:07 +0100
Subject: [PATCH] ARM: 7169/1: topdown mmap support
commit 7dbaa466780a754154531b44c2086f6618cee3a8 upstream.
Similar to other architectures, this adds topdown mmap support in user
process address space allocation policy. This allows mmap sizes greater
than 2GB. This support is largely copied from MIPS and the generic
@ -21,7 +20,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
arch/arm/include/asm/pgtable.h | 1 +
arch/arm/include/asm/processor.h | 2 +
arch/arm/mm/mmap.c | 173 ++++++++++++++++++++++++++++++++++++-
arch/arm/mm/mmap.c | 173 ++++++++++++++++++++++++++++++++++++--
3 files changed, 171 insertions(+), 5 deletions(-)
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
@ -254,5 +253,5 @@ index 44b628e..ce8cb19 100644
/*
* You really shouldn't be using read() or write() on /dev/mem. This
--
1.7.4.4
1.7.10

16
debian/patches/bugfix/x86/drm-i915-fix-operator-precedence-when-enabling-RC6p.patch vendored
View File

@ -1,16 +1,18 @@
From: Eugeni Dodonov <eugeni.dodonov@intel.com>
Date: Thu, 23 Feb 2012 17:57:06 -0800
Subject: [PATCH 1/1] drm/i915: fix operator precedence when enabling RC6p
Date: Thu, 23 Feb 2012 23:57:06 -0200
Subject: [PATCH] drm/i915: fix operator precedence when enabling RC6p
commit c0e2ee1bc0cf82eec89e26b7afe7e4db0561b7d9 upstream.
As noticed by Torsten Kaiser, the operator precedence can play tricks with
us here.
CC: Dave Airlie <airlied at redhat.com>
CC: Jesse Barnes <jbarnes at virtuousgeek.org>
Signed-off-by: Eugeni Dodonov <eugeni.dodonov at intel.com>
CC: Dave Airlie <airlied@redhat.com>
Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
---
drivers/gpu/drm/i915/intel_display.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index e654f32..4871ba0 100644
@ -26,5 +28,5 @@ index e654f32..4871ba0 100644
I915_WRITE(GEN6_RC_CONTROL,
rc6_mask |
--
1.7.8.4
1.7.10