diff options
| -rw-r--r-- | driver-core.current/debugfs-fix-up-debugfs_create_size_t-inline-function.patch | 36 | ||||
| -rw-r--r-- | driver-core.current/debugfs-introduce-stub-for-debugfs_create_size_t-when-debug_fs-n.patch | 46 | ||||
| -rw-r--r-- | driver-core.current/driver-core-convert-to-in-dev_set_name.patch | 56 | ||||
| -rw-r--r-- | driver-core.current/klist.c-bit-0-in-pointer-can-t-be-used-as-flag.patch | 74 | ||||
| -rw-r--r-- | driver-core.current/pnp-fix-broken-pnp-lowercasing-for-acpi-module-aliases.patch | 59 | ||||
| -rw-r--r-- | driver-core.current/sysfs-fix-problems-with-binary-files.patch | 41 | ||||
| -rw-r--r-- | driver-core/bus_id-net2.patch | 16 | ||||
| -rw-r--r-- | f1.patch | 2 | ||||
| -rw-r--r-- | series | 6 | ||||
| -rw-r--r-- | usb.current/usb-musb_hdrc-another-davinci-buildfix.patch | 2 | ||||
| -rw-r--r-- | version | 2 |
11 files changed, 48 insertions, 292 deletions
diff --git a/driver-core.current/debugfs-fix-up-debugfs_create_size_t-inline-function.patch b/driver-core.current/debugfs-fix-up-debugfs_create_size_t-inline-function.patch new file mode 100644 index 00000000000000..fbe673cb2f265c --- /dev/null +++ b/driver-core.current/debugfs-fix-up-debugfs_create_size_t-inline-function.patch @@ -0,0 +1,36 @@ +From foo@baz Mon Jan 26 17:24:33 PST 2009 +Date: Mon, 26 Jan 2009 17:24:33 -0800 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: debugfs: fix up debugfs_create_size_t() inline function + +From: Greg Kroah-Hartman <gregkh@suse.de> + +If CONFIG_DEBUGFS is disabled, the fixup patch from Inaky will still +keep the debugfs.h file from compiling properly. + +This should now be resolved with this patch. + +Cc: Inaky Perez-Gonzalez <inaky@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + include/linux/debugfs.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/include/linux/debugfs.h ++++ b/include/linux/debugfs.h +@@ -162,9 +162,10 @@ static inline struct dentry *debugfs_cre + return ERR_PTR(-ENODEV); + } + +-struct dentry *debugfs_create_size_t(const char *name, mode_t mode, +- struct dentry *parent, +- size_t *value) ++static inline struct dentry *debugfs_create_size_t(const char *name, ++ mode_t mode, ++ struct dentry *parent, ++ size_t *value) + { + return ERR_PTR(-ENODEV); + } diff --git a/driver-core.current/debugfs-introduce-stub-for-debugfs_create_size_t-when-debug_fs-n.patch b/driver-core.current/debugfs-introduce-stub-for-debugfs_create_size_t-when-debug_fs-n.patch deleted file mode 100644 index 70fe7e45c944c9..00000000000000 --- a/driver-core.current/debugfs-introduce-stub-for-debugfs_create_size_t-when-debug_fs-n.patch +++ /dev/null @@ -1,46 +0,0 @@ -From inaky@linux.intel.com Tue Jan 20 17:09:31 2009 -From: Inaky Perez-Gonzalez <inaky@linux.intel.com> -Date: Tue, 20 Jan 2009 12:17:28 -0800 -Subject: debugfs: introduce stub for debugfs_create_size_t() when DEBUG_FS=n -To: Toralf F�rster <toralf.foerster@gmx.de>, Greg KH <greg@kroah.com> -Cc: wimax@linuxwimax.org, linux-kernel@vger.kernel.org -Message-ID: <1232482648-2663-1-git-send-email-inaky@linux.intel.com> - -From: Inaky Perez-Gonzalez <inaky@linux.intel.com> - -Toralf F�rster <toralf.foerster@gmx.de> reported a build failure in -the WiMAX stack when CONFIG_DEBUG_FS=n - -http://linuxwimax.org/pipermail/wimax/2009-January/000449.html - -This is due to debugfs_create_size_t() missing an stub that returns --ENODEV when the DEBUGFS subsystem is not configured in (like the rest -of the debugfs API). - -This patch adds said stub. - -Reported-by: Toralf F�rster <toralf.foerster@gmx.de> -Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - include/linux/debugfs.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/include/linux/debugfs.h -+++ b/include/linux/debugfs.h -@@ -162,6 +162,14 @@ static inline struct dentry *debugfs_cre - return ERR_PTR(-ENODEV); - } - -+static inline struct dentry *debugfs_create_size_t(const char *name, -+ mode_t mode, -+ struct dentry *parent, -+ size_t *value) -+{ -+ return ERR_PTR(-ENODEV); -+} -+ - static inline struct dentry *debugfs_create_bool(const char *name, mode_t mode, - struct dentry *parent, - u32 *value) diff --git a/driver-core.current/driver-core-convert-to-in-dev_set_name.patch b/driver-core.current/driver-core-convert-to-in-dev_set_name.patch deleted file mode 100644 index b1c36956a2ea2c..00000000000000 --- a/driver-core.current/driver-core-convert-to-in-dev_set_name.patch +++ /dev/null @@ -1,56 +0,0 @@ -From rdreier@cisco.com Thu Jan 15 15:44:44 2009 -From: Roland Dreier <rdreier@cisco.com> -Date: Fri, 09 Jan 2009 22:27:42 -0800 -Subject: [PATCH] driver core: Convert '/' to '!' in dev_set_name() -To: Jens Axboe <jens.axboe@oracle.com>, Kay Sievers <kay.sievers@vrfy.org>, Greg Kroah-Hartman <gregkh@suse.de> -Message-ID: <adad4evoeu9.fsf@cisco.com> - -From: Roland Dreier <rdreier@cisco.com> - -Commit 3ada8b7e ("block: struct device - replace bus_id with dev_name(), -dev_set_name()") deleted the code in register_disk() that changed a '/' -to a '!' in the device name when registering a disk, but dev_set_name() -does not perform this conversion. - -This leads to amusing problems with disks that have '/' in their names: -for example a failure to boot with the root partition on a cciss device, -even though the kernel says it knows about the root device: - - VFS: Cannot open root device "cciss/c0d0p6" or unknown-block(0,0) - Please append a correct "root=" boot option; here are the available partitions: - 6800 71652960 cciss/c0d0 driver: cciss - 6802 1 cciss/c0d0p2 - 6805 2931831 cciss/c0d0p5 - 6806 34354908 cciss/c0d0p6 - 6810 71652960 cciss/c0d1 driver: cciss - -Fix this by adding code to change '/' to '!' in dev_set_name() to handle -this until dev_set_name() is converted to use kobject_set_name(). - -Signed-off-by: Roland Dreier <rolandd@cisco.com> -Acked-by: Kay Sievers <kay.sievers@vrfy.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/base/core.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/base/core.c -+++ b/drivers/base/core.c -@@ -777,10 +777,16 @@ static void device_remove_class_symlinks - int dev_set_name(struct device *dev, const char *fmt, ...) - { - va_list vargs; -+ char *s; - - va_start(vargs, fmt); - vsnprintf(dev->bus_id, sizeof(dev->bus_id), fmt, vargs); - va_end(vargs); -+ -+ /* ewww... some of these buggers have / in the name... */ -+ while ((s = strchr(dev->bus_id, '/'))) -+ *s = '!'; -+ - return 0; - } - EXPORT_SYMBOL_GPL(dev_set_name); diff --git a/driver-core.current/klist.c-bit-0-in-pointer-can-t-be-used-as-flag.patch b/driver-core.current/klist.c-bit-0-in-pointer-can-t-be-used-as-flag.patch deleted file mode 100644 index 4c5661226fb2ae..00000000000000 --- a/driver-core.current/klist.c-bit-0-in-pointer-can-t-be-used-as-flag.patch +++ /dev/null @@ -1,74 +0,0 @@ -From Jesper.Nilsson@axis.com Tue Jan 20 17:13:58 2009 -From: Jesper Nilsson <Jesper.Nilsson@axis.com> -Date: Wed, 14 Jan 2009 11:19:08 +0100 -Subject: klist.c: bit 0 in pointer can't be used as flag -To: Bastien ROUCARIES <roucaries.bastien@gmail.com> -Cc: David Miller <davem@davemloft.net>, tj@kernel.org, gregkh@suse.de, stern@rowland.harvard.edu, jens.axboe@oracle.com, hinko.kocevar@cetrtapot.si -Message-ID: <20090114101908.GF19262@axis.com> -Content-Disposition: inline - -From: Jesper Nilsson <Jesper.Nilsson@axis.com> - -The commit a1ed5b0cffe4b16a93a6a3390e8cee0fbef94f86 -(klist: don't iterate over deleted entries) introduces use of the -low bit in a pointer to indicate if the knode is dead or not, -assuming that this bit is always free. - -This is not true for all architectures, CRIS for example may align data -on byte borders. - -The result is a bunch of warnings on bootup, devices not being -added correctly etc, reported by Hinko Kocevar <hinko.kocevar@cetrtapot.si>: - -------------[ cut here ]------------ -WARNING: at lib/klist.c:62 () -Modules linked in: - -Stack from c1fe1cf0: - c01cc7f4 c1fe1d11 c000eb4e c000e4de 00000000 00000000 c1f4f78f c1f50c2d - c01d008c c1fdd1a0 c1fdd1a0 c1fe1d38 c0192954 c1fe0000 00000000 c1fe1dc0 - 00000002 7fffffff c1fe1da8 c0192d50 c1fe1dc0 00000002 7fffffff c1ff9fcc -Call Trace: [<c000eb4e>] [<c000e4de>] [<c0192954>] [<c0192d50>] [<c001d49e>] [<c000b688>] [<c0192a3c>] - [<c000b63e>] [<c000b63e>] [<c001a542>] [<c00b55b0>] [<c00411c0>] [<c00b559c>] [<c01918e6>] [<c0191988>] - [<c01919d0>] [<c00cd9c8>] [<c00cdd6a>] [<c0034178>] [<c000409a>] [<c0015576>] [<c0029130>] [<c0029078>] - [<c0029170>] [<c0012336>] [<c00b4076>] [<c00b4770>] [<c006d6e4>] [<c006d974>] [<c006dca0>] [<c0028d6c>] - [<c0028e12>] [<c0006424>] <4>---[ end trace 4eaa2a86a8e2da22 ]--- -------------[ cut here ]------------ -Repeat ad nauseam. - -Wed, Jan 14, 2009 at 12:11:32AM +0100, Bastien ROUCARIES wrote: -> Perhaps using a pointerhackalign trick on this structure where -> #define pointerhackalign(x) __attribute__ ((aligned (x))) -> and declare -> struct klist_node { -> ... -> } pointerhackalign(2); -> -> Because __attribute__ ((aligned (x))) could only increase alignment -> it will safe to do that and serve as documentation purpose :) - -That works, but we need to do it not for the struct klist_node, -but for the struct we insert into the void * in klist_node, -which is struct klist. - -Reported-by: Hinko Kocevar <hinko.kocevar@cetrtapot.si -Cc: Bastien ROUCARIES <roucaries.bastien@gmail.com> -Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - include/linux/klist.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/include/linux/klist.h -+++ b/include/linux/klist.h -@@ -22,7 +22,7 @@ struct klist { - struct list_head k_list; - void (*get)(struct klist_node *); - void (*put)(struct klist_node *); --}; -+} __attribute__ ((aligned (4))); - - #define KLIST_INIT(_name, _get, _put) \ - { .k_lock = __SPIN_LOCK_UNLOCKED(_name.k_lock), \ diff --git a/driver-core.current/pnp-fix-broken-pnp-lowercasing-for-acpi-module-aliases.patch b/driver-core.current/pnp-fix-broken-pnp-lowercasing-for-acpi-module-aliases.patch deleted file mode 100644 index 6081d9d4b1aaac..00000000000000 --- a/driver-core.current/pnp-fix-broken-pnp-lowercasing-for-acpi-module-aliases.patch +++ /dev/null @@ -1,59 +0,0 @@ -From kay.sievers@vrfy.org Thu Jan 15 15:46:05 2009 -From: Kay Sievers <kay.sievers@vrfy.org> -Date: Thu, 08 Jan 2009 03:06:42 +0100 -Subject: PNP: fix broken pnp lowercasing for acpi module aliases -To: Greg KH <greg@kroah.com> -Message-ID: <1231380402.3677.98.camel@nga> - -From: Kay Sievers <kay.sievers@vrfy.org> - -Based on a patch from Brian, who identified the issue. - -Signed-off-by: Bryan Kadzban <bryan@kadzban.is-a-geek.net> -Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - scripts/mod/file2alias.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - ---- a/scripts/mod/file2alias.c -+++ b/scripts/mod/file2alias.c -@@ -366,11 +366,17 @@ static void do_pnp_device_entry(void *sy - - for (i = 0; i < count; i++) { - const char *id = (char *)devs[i].id; -+ char acpi_id[sizeof(devs[0].id)]; -+ int j; - - buf_printf(&mod->dev_table_buf, - "MODULE_ALIAS(\"pnp:d%s*\");\n", id); -+ -+ /* fix broken pnp bus lowercasing */ -+ for (j = 0; j < sizeof(acpi_id); j++) -+ acpi_id[j] = toupper(id[j]); - buf_printf(&mod->dev_table_buf, -- "MODULE_ALIAS(\"acpi*:%s:*\");\n", id); -+ "MODULE_ALIAS(\"acpi*:%s:*\");\n", acpi_id); - } - } - -@@ -416,10 +422,17 @@ static void do_pnp_card_entries(void *sy - - /* add an individual alias for every device entry */ - if (!dup) { -+ char acpi_id[sizeof(card->devs[0].id)]; -+ int k; -+ - buf_printf(&mod->dev_table_buf, - "MODULE_ALIAS(\"pnp:d%s*\");\n", id); -+ -+ /* fix broken pnp bus lowercasing */ -+ for (k = 0; k < sizeof(acpi_id); k++) -+ acpi_id[k] = toupper(id[k]); - buf_printf(&mod->dev_table_buf, -- "MODULE_ALIAS(\"acpi*:%s:*\");\n", id); -+ "MODULE_ALIAS(\"acpi*:%s:*\");\n", acpi_id); - } - } - } diff --git a/driver-core.current/sysfs-fix-problems-with-binary-files.patch b/driver-core.current/sysfs-fix-problems-with-binary-files.patch deleted file mode 100644 index df380156a9aa70..00000000000000 --- a/driver-core.current/sysfs-fix-problems-with-binary-files.patch +++ /dev/null @@ -1,41 +0,0 @@ -From foo@baz Tue Jan 20 15:51:16 PST 2009 -Date: Tue, 20 Jan 2009 15:51:16 -0800 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: sysfs: fix problems with binary files - -Some sysfs binary files don't like having 0 passed to them as a size. -Fix this up at the root by just returning to the vfs if userspace asks -us for a zero sized buffer. - -Thanks to Pavel Roskin for pointing this out. - -Reported-by: Pavel Roskin <proski@gnu.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - fs/sysfs/bin.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/fs/sysfs/bin.c -+++ b/fs/sysfs/bin.c -@@ -63,6 +63,9 @@ read(struct file *file, char __user *use - int count = min_t(size_t, bytes, PAGE_SIZE); - char *temp; - -+ if (!bytes) -+ return 0; -+ - if (size) { - if (offs > size) - return 0; -@@ -131,6 +134,9 @@ static ssize_t write(struct file *file, - int count = min_t(size_t, bytes, PAGE_SIZE); - char *temp; - -+ if (!bytes) -+ return 0; -+ - if (size) { - if (offs > size) - return 0; diff --git a/driver-core/bus_id-net2.patch b/driver-core/bus_id-net2.patch index 488629f1f3c0de..3ca7fe81aba664 100644 --- a/driver-core/bus_id-net2.patch +++ b/driver-core/bus_id-net2.patch @@ -40,7 +40,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c -@@ -355,8 +355,8 @@ static int mii_probe (struct net_device +@@ -355,8 +355,8 @@ static int mii_probe (struct net_device /* now we are supposed to have a proper phydev, to attach to... */ BUG_ON(phydev->attached_dev); @@ -51,7 +51,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> if (IS_ERR(phydev)) { printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name); -@@ -381,8 +381,8 @@ static int mii_probe (struct net_device +@@ -381,8 +381,8 @@ static int mii_probe (struct net_device aup->phy_dev = phydev; printk(KERN_INFO "%s: attached PHY driver [%s] " @@ -111,7 +111,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> static const struct ethtool_ops bmac_ethtool_ops = { --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c -@@ -1161,7 +1161,7 @@ static int __devinit cpmac_probe(struct +@@ -1161,7 +1161,7 @@ static int __devinit cpmac_probe(struct priv->msg_enable = netif_msg_init(debug_level, 0xff); memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr)); @@ -146,7 +146,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> } --- a/drivers/net/depca.c +++ b/drivers/net/depca.c -@@ -606,8 +606,8 @@ static int __init depca_hw_init (struct +@@ -606,8 +606,8 @@ static int __init depca_hw_init (struct if (!mem_start || lp->adapter < DEPCA || lp->adapter >=unknown) return -ENXIO; @@ -157,7 +157,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> switch (lp->depca_bus) { #ifdef CONFIG_MCA -@@ -669,7 +669,7 @@ static int __init depca_hw_init (struct +@@ -669,7 +669,7 @@ static int __init depca_hw_init (struct spin_lock_init(&lp->lock); sprintf(lp->adapter_name, "%s (%s)", @@ -214,7 +214,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> &macb_handle_link_change, 0, PHY_INTERFACE_MODE_MII); } -@@ -1069,7 +1069,7 @@ static void macb_get_drvinfo(struct net_ +@@ -1077,7 +1077,7 @@ static void macb_get_drvinfo(struct net_ strcpy(info->driver, bp->pdev->dev.driver->name); strcpy(info->version, "$Revision: 1.14 $"); @@ -223,7 +223,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> } static struct ethtool_ops macb_ethtool_ops = { -@@ -1226,8 +1226,8 @@ static int __init macb_probe(struct plat +@@ -1234,8 +1234,8 @@ static int __init macb_probe(struct plat phydev = bp->phy_dev; printk(KERN_INFO "%s: attached PHY driver [%s] " @@ -286,7 +286,7 @@ Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c -@@ -2586,7 +2586,7 @@ static void phy_init(struct mv643xx_eth_ +@@ -2589,7 +2589,7 @@ static void phy_init(struct mv643xx_eth_ phy_reset(mp); diff --git a/f1.patch b/f1.patch index 02086133ae971a..2b74ff2a8c04e2 100644 --- a/f1.patch +++ b/f1.patch @@ -698,7 +698,7 @@ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4396,7 +4396,9 @@ int register_netdevice(struct net_device +@@ -4409,7 +4409,9 @@ int register_netdevice(struct net_device if (dev->features & NETIF_F_SG) dev->features |= NETIF_F_GSO; @@ -11,11 +11,7 @@ gregkh.pre/detect-atomic-counter-underflows.patch ################################# # Driver core patches for 2.6.29 ################################# -driver-core.current/driver-core-convert-to-in-dev_set_name.patch -driver-core.current/pnp-fix-broken-pnp-lowercasing-for-acpi-module-aliases.patch -driver-core.current/sysfs-fix-problems-with-binary-files.patch -driver-core.current/debugfs-introduce-stub-for-debugfs_create_size_t-when-debug_fs-n.patch -driver-core.current/klist.c-bit-0-in-pointer-can-t-be-used-as-flag.patch +driver-core.current/debugfs-fix-up-debugfs_create_size_t-inline-function.patch driver-core.current/sync-patch-for-jp_jp-stable_kernel_rules.txt.patch driver-core.current/uio-add-missing-documentation-of-features-added-recently.patch driver-core.current/driver-core-fix-kernel-doc-parameter-name.patch diff --git a/usb.current/usb-musb_hdrc-another-davinci-buildfix.patch b/usb.current/usb-musb_hdrc-another-davinci-buildfix.patch index 9bd7ee93ae114c..419b5aa25aa1f9 100644 --- a/usb.current/usb-musb_hdrc-another-davinci-buildfix.patch +++ b/usb.current/usb-musb_hdrc-another-davinci-buildfix.patch @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c -@@ -76,29 +76,6 @@ static struct platform_device usb_dev = +@@ -77,29 +77,6 @@ static struct platform_device usb_dev = .num_resources = ARRAY_SIZE(usb_resources), }; @@ -1 +1 @@ -2.6.29-rc2-git1 +2.6.29-rc2-git2 |