diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 14:45:58 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 14:45:58 -0700 |
| commit | 6e50599a5409415072595dea705df45a4d22c0c2 (patch) | |
| tree | a36b500031f38ae731875ff3ffcf4d8e4065c623 | |
| parent | e0652de970c6355f0d50aff1d77fdfab7b64eb9f (diff) | |
| download | patches-6e50599a5409415072595dea705df45a4d22c0c2.tar.gz | |
2.6.26-git8 refresh
| -rw-r--r-- | driver-core/debugfs-implement-debugfs_remove_recursive.patch | 4 | ||||
| -rw-r--r-- | driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch | 6 | ||||
| -rw-r--r-- | driver-core/sysfs-crash-debugging.patch | 4 | ||||
| -rw-r--r-- | version | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/driver-core/debugfs-implement-debugfs_remove_recursive.patch b/driver-core/debugfs-implement-debugfs_remove_recursive.patch index 04d4aa2c4a74b9..363c280f82c67a 100644 --- a/driver-core/debugfs-implement-debugfs_remove_recursive.patch +++ b/driver-core/debugfs-implement-debugfs_remove_recursive.patch @@ -175,7 +175,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * debugfs_rename - rename a file/directory in the debugfs filesystem --- a/include/linux/debugfs.h +++ b/include/linux/debugfs.h -@@ -42,6 +42,7 @@ struct dentry *debugfs_create_symlink(co +@@ -44,6 +44,7 @@ struct dentry *debugfs_create_symlink(co const char *dest); void debugfs_remove(struct dentry *dentry); @@ -183,7 +183,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, struct dentry *new_dir, const char *new_name); -@@ -99,6 +100,9 @@ static inline struct dentry *debugfs_cre +@@ -101,6 +102,9 @@ static inline struct dentry *debugfs_cre static inline void debugfs_remove(struct dentry *dentry) { } diff --git a/driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch b/driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch index 4aa66bf7e68da4..4711d710b73a62 100644 --- a/driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch +++ b/driver-core/driver-core-fix-a-lot-of-printk-usages-of-bus_id.patch @@ -133,7 +133,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pci_write_config_byte(viaide, PCI_CLASS_PROG, progif & ~0x5); --- a/arch/x86/kernel/pci-dma.c +++ b/arch/x86/kernel/pci-dma.c -@@ -323,8 +323,7 @@ int dma_supported(struct device *dev, u6 +@@ -314,8 +314,7 @@ int dma_supported(struct device *dev, u6 { #ifdef CONFIG_PCI if (mask > 0xffffffff && forbid_dac > 0) { @@ -143,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 0; } #endif -@@ -351,8 +350,7 @@ int dma_supported(struct device *dev, u6 +@@ -342,8 +341,7 @@ int dma_supported(struct device *dev, u6 type. Normally this doesn't make any difference, but gives more gentle handling of IOMMU overflow. */ if (iommu_sac_force && (mask >= DMA_40BIT_MASK)) { @@ -155,7 +155,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c -@@ -197,9 +197,7 @@ static void iommu_full(struct device *de +@@ -198,9 +198,7 @@ static void iommu_full(struct device *de * out. Hopefully no network devices use single mappings that big. */ diff --git a/driver-core/sysfs-crash-debugging.patch b/driver-core/sysfs-crash-debugging.patch index 25bd29f4dd57c0..ecb09fd911c01e 100644 --- a/driver-core/sysfs-crash-debugging.patch +++ b/driver-core/sysfs-crash-debugging.patch @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/arch/x86/kernel/traps_32.c +++ b/arch/x86/kernel/traps_32.c -@@ -399,6 +399,7 @@ int __kprobes __die(const char *str, str +@@ -428,6 +428,7 @@ int __kprobes __die(const char *str, str printk("DEBUG_PAGEALLOC"); #endif printk("\n"); @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return 1; --- a/arch/x86/kernel/traps_64.c +++ b/arch/x86/kernel/traps_64.c -@@ -549,6 +549,7 @@ int __kprobes __die(const char *str, str +@@ -537,6 +537,7 @@ int __kprobes __die(const char *str, str printk("DEBUG_PAGEALLOC"); #endif printk("\n"); @@ -1 +1 @@ -2.6.26-git7 +2.6.26-git8 |