Home| summaryrefslogtreecommitdiff |
diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-08 09:49:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-08 09:49:15 -0700 |
| commit | 3161ffc424838f7e32e6d64970eef2ff8f016cd1 (patch) | |
| tree | abf64c4eb0480da81ff7916a6c12acd6e20fd0c1 | |
| parent | d92f78cea58d888ea473ed1a9c7b225540d829b8 (diff) | |
- refresh patches for fuzz due to upstream changesrpm-2.6.31-7--openSUSE-11.2-Milestone7rpm-2.6.31-7
60 files changed, 216 insertions, 187 deletions
diff --git a/kernel-source.changes b/kernel-source.changes index 2b29c3c149..cf8aaad3b6 100644 --- a/kernel-source.changes +++ b/kernel-source.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Sep 8 18:48:55 CEST 2009 - gregkh@suse.de + +- refresh patches for fuzz due to upstream changes + +------------------------------------------------------------------- Tue Sep 8 18:44:20 CEST 2009 - gregkh@suse.de - Update to 2.6.31-rc9 diff --git a/patches.apparmor/apparmor.diff b/patches.apparmor/apparmor.diff index 0237c15ccf..4b03c3eec3 100644 --- a/patches.apparmor/apparmor.diff +++ b/patches.apparmor/apparmor.diff @@ -78,7 +78,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> #define AUDIT_ANOM_PROMISCUOUS 1700 /* Device changed promiscuous mode */ --- a/security/Kconfig +++ b/security/Kconfig -@@ -141,6 +141,7 @@ config LSM_MMAP_MIN_ADDR +@@ -132,6 +132,7 @@ config LSM_MMAP_MIN_ADDR source security/selinux/Kconfig source security/smack/Kconfig source security/tomoyo/Kconfig @@ -1311,7 +1311,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + unsigned int state = DFA_START; + struct aa_audit_file sa; + struct path_cond cond = { bprm->file->f_path.dentry->d_inode->i_uid, -+ bprm->file->f_path.dentry->d_inode->i_mode }; ++ bprm->file->f_path.dentry->d_inode->i_mode }; + + sa.base.error = cap_bprm_set_creds(bprm); + if (sa.base.error) @@ -1461,7 +1461,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + + /* the decision to use secure exec is computed in set_creds + * and stored in bprm->unsafe. The AppArmor X_UNSAFE flag is -+ * indicates don't ++ * indicates don't + */ + if (!ret && (bprm->unsafe & AA_SECURE_X_NEEDED)) + ret = 1; @@ -1517,7 +1517,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + } +} + -+/* ++/* + * derived from security/selinux/hooks.c: flush_unauthorized_files && + * fs/exec.c:flush_old_files + */ @@ -1557,7 +1557,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + } + spin_lock(&files->file_lock); + } -+ spin_unlock(&files->file_lock); ++ spin_unlock(&files->file_lock); + kfree(buffer); + return 0; +} @@ -1764,7 +1764,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + goto audit; + target = aa_alloc_null_profile(profile, 0); + } -+ ++ + /* check if tracing task is allowed to trace target domain */ + sa.base.error = aa_may_change_ptraced_domain(current, target); + if (sa.base.error) { @@ -2583,7 +2583,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> +#define AA_X_INDEX_MASK 0x03ff + +#define AA_X_TYPE_MASK 0x0c00 -+#define AA_X_TYPE_SHIFT 10 ++#define AA_X_TYPE_SHIFT 10 +#define AA_X_NONE 0x0000 +#define AA_X_NAME 0x0400 /* use executable name px */ +#define AA_X_TABLE 0x0800 /* use a specified name ->n# */ @@ -3159,7 +3159,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + +extern struct aa_namespace *default_namespace; +extern enum profile_mode g_profile_mode; -+ ++ + +void aa_add_profile(struct aa_policy_common *common, + struct aa_profile *profile); @@ -3171,7 +3171,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> +void free_aa_namespace(struct aa_namespace *ns); +struct aa_namespace *__aa_find_namespace(struct list_head *head, + const char *name); -+ ++ +struct aa_namespace *aa_find_namespace(const char *name); +struct aa_namespace *aa_prepare_namespace(const char *name); +void aa_remove_namespace(struct aa_namespace *ns); @@ -3871,7 +3871,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + if (!buffer) + goto out; + -+ /* ++ /* + * TODO: convert this over to using a global or per + * namespace control instead of a hard coded /proc + */ @@ -3904,7 +3904,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> +} + +static int common_perm_dentry(const char *op, struct path *dir, -+ struct dentry *dentry, u16 mask, ++ struct dentry *dentry, u16 mask, + struct path_cond *cond) +{ + struct path path = { dir->mnt, dentry }; @@ -4014,7 +4014,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + if (!error) + error = aa_path_perm(profile, "rename_dest", &new_path, + AA_MAY_CREATE | MAY_WRITE, &cond); -+ ++ + } + return error; +} @@ -4023,7 +4023,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> +{ + struct aa_profile *profile; + int error = 0; -+ ++ + /* If in exec permission is handled by bprm hooks */ + if (current->in_execve || + !mediated_filesystem(file->f_path.dentry->d_inode)) @@ -4032,7 +4032,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + aa_cred_policy(cred, &profile); + if (profile) { + struct aa_file_cxt *fcxt = file->f_security; -+ struct inode *inode = file->f_path.dentry->d_inode; ++ struct inode *inode = file->f_path.dentry->d_inode; + struct path_cond cond = { inode->i_uid, inode->i_mode }; + + error = aa_path_perm(profile, "open", &file->f_path, @@ -4124,7 +4124,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + +/* + * AppArmor doesn't current use the fcntl hook. -+ * ++ * + * FIXME - these are not implemented yet - REMOVE file_fcntl hook + * NOTE: some of the file control commands are further mediated + * by other hooks @@ -5157,7 +5157,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + + audit_log_format(ab, " protocol=%d", sa->protocol); + } -+ ++ +} + +static int aa_audit_net(struct aa_profile *profile, struct aa_audit_net *sa) @@ -5508,7 +5508,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + +static struct aa_policy_common *__common_find(struct list_head *head, + const char *name) -+ ++ +{ + struct aa_policy_common *common; + @@ -5631,7 +5631,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + +struct aa_namespace *__aa_find_namespace(struct list_head *head, + const char *name) -+ ++ +{ + return (struct aa_namespace *) __common_find(head, name); +} @@ -5679,7 +5679,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> +struct aa_namespace *aa_prepare_namespace(const char *name) +{ + struct aa_namespace *ns; -+ ++ + write_lock(&ns_list_lock); + if (name) + ns = aa_get_namespace(__aa_find_namespace(&ns_list, name)); @@ -5820,12 +5820,12 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + profile = kzalloc(sizeof(*profile), GFP_KERNEL); + if (!profile) + return NULL; -+ ++ + if (!common_init(&profile->base, fqname)) { + kfree(profile); + return NULL; + } -+ ++ + profile->fqname = profile->base.name; + profile->base.name = (char *) fqname_subname((const char *) profile->fqname); + return profile; @@ -5996,7 +5996,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + + common = &ns->base; + -+ ++ + for (split = strstr(fqname, "//"); split; ) { + profile = __aa_find_profile_by_strn(&common->profiles, fqname, + split - fqname); @@ -6124,7 +6124,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + profile = NULL; + break; + } -+ } ++ } + } + + return profile; @@ -6848,7 +6848,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> + sa.base.info = "failed to prepare namespace"; + sa.base.error = -ENOMEM; + goto fail; -+ } ++ } + + sa.name = new_profile->fqname; + @@ -7267,13 +7267,13 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> +{ + u32 sid; + -+ /* ++ /* + * TODO FIXME: sid recycling - part of profile mapping table + */ + spin_lock(&sid_lock); + if (is_usr) { + sid = (++global_usr_sid) << 16; -+ ++ + } else { + sid = ++global_sys_sid; + } diff --git a/patches.apparmor/security-default-lsm b/patches.apparmor/security-default-lsm index e5d94e4d78..a02e0a1831 100644 --- a/patches.apparmor/security-default-lsm +++ b/patches.apparmor/security-default-lsm @@ -9,14 +9,13 @@ References: bnc#442668 Signed-off-by: John Johansen <jjohansen@suse.de> --- - security/Kconfig | 9 +++++++++ - security/apparmor/lsm.c | 5 +++-- - security/security.c | 2 +- - 3 files changed, 13 insertions(+), 3 deletions(-) + security/Kconfig | 9 +++++++++ + security/security.c | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) --- a/security/Kconfig +++ b/security/Kconfig -@@ -59,6 +59,15 @@ config SECURITYFS +@@ -60,6 +60,15 @@ config SECURITYFS If you are unsure how to answer this question, answer N. diff --git a/patches.arch/acpi-export-hotplug_execute b/patches.arch/acpi-export-hotplug_execute index 9e8f2cc4d5..1cb88ab2c3 100644 --- a/patches.arch/acpi-export-hotplug_execute +++ b/patches.arch/acpi-export-hotplug_execute @@ -13,7 +13,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com> --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c -@@ -778,6 +778,7 @@ acpi_status acpi_os_hotplug_execute(acpi +@@ -803,6 +803,7 @@ acpi_status acpi_os_hotplug_execute(acpi { return __acpi_os_execute(0, function, context, 1); } diff --git a/patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch b/patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch index c3f23c982f..68f47fd36a 100644 --- a/patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch +++ b/patches.arch/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch @@ -30,7 +30,7 @@ CC: Yakui Zhao <yakui.zhao@intel.com> --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c -@@ -1403,6 +1403,21 @@ static int __init dmi_ignore_irq0_timer_ +@@ -1404,6 +1404,21 @@ static int __init dmi_ignore_irq0_timer_ return 0; } @@ -52,7 +52,7 @@ CC: Yakui Zhao <yakui.zhao@intel.com> /* * If your system is blacklisted here, but you find that acpi=force * works for you, please contact linux-acpi@vger.kernel.org -@@ -1562,6 +1577,32 @@ static struct dmi_system_id __initdata a +@@ -1563,6 +1578,32 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), }, }, @@ -85,7 +85,7 @@ CC: Yakui Zhao <yakui.zhao@intel.com> {} }; -@@ -1762,6 +1803,18 @@ static int __init parse_acpi(char *arg) +@@ -1763,6 +1804,18 @@ static int __init parse_acpi(char *arg) } early_param("acpi", parse_acpi); diff --git a/patches.arch/add_x86_support_for_hpet_msi_intr_remap.patch b/patches.arch/add_x86_support_for_hpet_msi_intr_remap.patch index 23fefaff06..fe7120fca3 100644 --- a/patches.arch/add_x86_support_for_hpet_msi_intr_remap.patch +++ b/patches.arch/add_x86_support_for_hpet_msi_intr_remap.patch @@ -44,7 +44,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> } --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c -@@ -636,6 +636,7 @@ static int __init acpi_parse_hpet(struct +@@ -624,6 +624,7 @@ static int __init acpi_parse_hpet(struct } hpet_address = hpet_tbl->address.address; @@ -54,7 +54,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> * Some broken BIOSes advertise HPET at 0x0. We really do not --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c -@@ -3262,7 +3262,8 @@ void destroy_irq(unsigned int irq) +@@ -3254,7 +3254,8 @@ void destroy_irq(unsigned int irq) * MSI message composition */ #ifdef CONFIG_PCI_MSI @@ -64,7 +64,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> { struct irq_cfg *cfg; int err; -@@ -3296,7 +3297,10 @@ static int msi_compose_msg(struct pci_de +@@ -3288,7 +3289,10 @@ static int msi_compose_msg(struct pci_de irte.dest_id = IRTE_DEST(dest); /* Set source-id of interrupt request */ @@ -76,7 +76,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> modify_irte(irq, &irte); -@@ -3461,7 +3465,7 @@ static int setup_msi_irq(struct pci_dev +@@ -3453,7 +3457,7 @@ static int setup_msi_irq(struct pci_dev int ret; struct msi_msg msg; @@ -85,7 +85,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> if (ret < 0) return ret; -@@ -3594,7 +3598,7 @@ int arch_setup_dmar_msi(unsigned int irq +@@ -3586,7 +3590,7 @@ int arch_setup_dmar_msi(unsigned int irq int ret; struct msi_msg msg; @@ -94,7 +94,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> if (ret < 0) return ret; dmar_msi_write(irq, &msg); -@@ -3634,6 +3638,19 @@ static int hpet_msi_set_affinity(unsigne +@@ -3626,6 +3630,19 @@ static int hpet_msi_set_affinity(unsigne #endif /* CONFIG_SMP */ @@ -114,7 +114,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> static struct irq_chip hpet_msi_type = { .name = "HPET_MSI", .unmask = hpet_msi_unmask, -@@ -3645,20 +3662,36 @@ static struct irq_chip hpet_msi_type = { +@@ -3637,20 +3654,36 @@ static struct irq_chip hpet_msi_type = { .retrigger = ioapic_retrigger_irq, }; diff --git a/patches.arch/mm-avoid-bad-page-on-lru b/patches.arch/mm-avoid-bad-page-on-lru index 9b8100b132..7bf08a2e25 100644 --- a/patches.arch/mm-avoid-bad-page-on-lru +++ b/patches.arch/mm-avoid-bad-page-on-lru @@ -137,7 +137,7 @@ Reviewed-by: Christoph Lameter <cl@linux-foundation.org> /* --- a/mm/vmscan.c +++ b/mm/vmscan.c -@@ -1027,6 +1027,7 @@ int isolate_lru_page(struct page *page) +@@ -1032,6 +1032,7 @@ int isolate_lru_page(struct page *page) } return ret; } diff --git a/patches.arch/ppc-ipic-suspend-without-83xx-fix b/patches.arch/ppc-ipic-suspend-without-83xx-fix index 1587dd0b3f..8b9b6c3935 100644 --- a/patches.arch/ppc-ipic-suspend-without-83xx-fix +++ b/patches.arch/ppc-ipic-suspend-without-83xx-fix @@ -15,7 +15,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de> --- a/arch/powerpc/sysdev/ipic.c +++ b/arch/powerpc/sysdev/ipic.c -@@ -918,6 +918,7 @@ static int ipic_suspend(struct sys_devic +@@ -916,6 +916,7 @@ static int ipic_suspend(struct sys_devic ipic_saved_state.sermr = ipic_read(ipic->regs, IPIC_SERMR); ipic_saved_state.sercr = ipic_read(ipic->regs, IPIC_SERCR); @@ -23,7 +23,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de> if (fsl_deep_sleep()) { /* In deep sleep, make sure there can be no * pending interrupts, as this can cause -@@ -928,6 +929,7 @@ static int ipic_suspend(struct sys_devic +@@ -926,6 +927,7 @@ static int ipic_suspend(struct sys_devic ipic_write(ipic->regs, IPIC_SEMSR, 0); ipic_write(ipic->regs, IPIC_SERMR, 0); } diff --git a/patches.arch/s390-08-02-zfcp-gpn-align-fix.diff b/patches.arch/s390-08-02-zfcp-gpn-align-fix.diff index 6525d02f2c..3a11303d83 100644 --- a/patches.arch/s390-08-02-zfcp-gpn-align-fix.diff +++ b/patches.arch/s390-08-02-zfcp-gpn-align-fix.diff @@ -82,7 +82,7 @@ Acked-by: John Jolly <jjolly@suse.de> struct gpn_ft_resp_acc { u8 control; u8 port_id[3]; -@@ -481,7 +473,8 @@ static void zfcp_free_sg_env(struct zfcp +@@ -479,7 +471,8 @@ static void zfcp_free_sg_env(struct zfcp { struct scatterlist *sg = &gpn_ft->sg_req; @@ -92,7 +92,7 @@ Acked-by: John Jolly <jjolly@suse.de> zfcp_sg_free_table(gpn_ft->sg_resp, buf_num); kfree(gpn_ft); -@@ -496,7 +489,7 @@ static struct zfcp_gpn_ft *zfcp_alloc_sg +@@ -494,7 +487,7 @@ static struct zfcp_gpn_ft *zfcp_alloc_sg if (!gpn_ft) return NULL; diff --git a/patches.drivers/alsa-usb-03-Xonar-U1-digital-output-support b/patches.drivers/alsa-usb-03-Xonar-U1-digital-output-support index c0ac659a7a..308349491b 100644 --- a/patches.drivers/alsa-usb-03-Xonar-U1-digital-output-support +++ b/patches.drivers/alsa-usb-03-Xonar-U1-digital-output-support @@ -17,7 +17,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de> --- a/sound/usb/usbmixer.c +++ b/sound/usb/usbmixer.c -@@ -86,6 +86,7 @@ +@@ -86,6 +86,7 @@ struct usb_mixer_interface { u8 rc_buffer[6]; u8 audigy2nx_leds[3]; @@ -25,7 +25,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de> }; -@@ -2027,6 +2028,58 @@ +@@ -2042,6 +2043,58 @@ static void snd_audigy2nx_proc_read(stru } } @@ -84,7 +84,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de> int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif, int ignore_error) { -@@ -2069,6 +2122,13 @@ +@@ -2084,6 +2137,13 @@ int snd_usb_create_mixer(struct snd_usb_ snd_audigy2nx_proc_read); } diff --git a/patches.drivers/elousb.patch b/patches.drivers/elousb.patch index 406254cd4c..efe9361eaf 100644 --- a/patches.drivers/elousb.patch +++ b/patches.drivers/elousb.patch @@ -18,7 +18,7 @@ Acked-by: Jiri Kosina <jkosina@suse.cz> --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c -@@ -1518,6 +1518,8 @@ static const struct hid_device_id hid_ig +@@ -1520,6 +1520,8 @@ static const struct hid_device_id hid_ig { HID_USB_DEVICE(USB_VENDOR_ID_DEALEXTREAME, USB_DEVICE_ID_DEALEXTREAME_RADIO_SI4701) }, { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EARTHMATE) }, { HID_USB_DEVICE(USB_VENDOR_ID_DELORME, USB_DEVICE_ID_DELORME_EM_LT20) }, diff --git a/patches.drivers/libata-ata_piix-clear-spurious-IRQ b/patches.drivers/libata-ata_piix-clear-spurious-IRQ index f1745b4973..89908435db 100644 --- a/patches.drivers/libata-ata_piix-clear-spurious-IRQ +++ b/patches.drivers/libata-ata_piix-clear-spurious-IRQ @@ -15,7 +15,7 @@ Signed-off-by: Tejun Heo <teheo@suse.de> --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c -@@ -934,6 +934,58 @@ static int piix_sidpr_scr_read(struct at +@@ -949,6 +949,58 @@ static int piix_sidpr_scr_read(struct at return 0; } @@ -74,7 +74,7 @@ Signed-off-by: Tejun Heo <teheo@suse.de> static int piix_sidpr_scr_write(struct ata_link *link, unsigned int reg, u32 val) { -@@ -1592,7 +1644,7 @@ static int __devinit piix_init_one(struc +@@ -1607,7 +1659,7 @@ static int __devinit piix_init_one(struc host->flags |= ATA_HOST_PARALLEL_SCAN; pci_set_master(pdev); diff --git a/patches.fixes/dm-table-switch-to-readonly b/patches.fixes/dm-table-switch-to-readonly index 8210c5a198..a7c91010c7 100644 --- a/patches.fixes/dm-table-switch-to-readonly +++ b/patches.fixes/dm-table-switch-to-readonly @@ -16,7 +16,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de> --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c -@@ -455,11 +455,19 @@ static int __table_get_device(struct dm_ +@@ -459,11 +459,19 @@ static int __table_get_device(struct dm_ dd->dm_dev.mode = mode; dd->dm_dev.bdev = NULL; @@ -75,7 +75,7 @@ Signed-off-by: Hannes Reinecke <hare@suse.de> } static int dm_blk_close(struct gendisk *disk, fmode_t mode) -@@ -1951,6 +1960,11 @@ static int __bind(struct mapped_device * +@@ -1956,6 +1965,11 @@ static int __bind(struct mapped_device * write_lock_irqsave(&md->map_lock, flags); md->map = t; dm_table_set_restrictions(t, q, limits); diff --git a/patches.fixes/do_anonymous_page-race b/patches.fixes/do_anonymous_page-race index 5886e46594..eecdd9a8a0 100644 --- a/patches.fixes/do_anonymous_page-race +++ b/patches.fixes/do_anonymous_page-race @@ -15,7 +15,7 @@ after the I/O, and this makes sure no race can happen anymore. --- a/fs/bio.c +++ b/fs/bio.c -@@ -1395,6 +1395,16 @@ void bio_endio(struct bio *bio, int erro +@@ -1397,6 +1397,16 @@ void bio_endio(struct bio *bio, int erro else if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) error = -EIO; diff --git a/patches.fixes/ext3-mark-super-uptodate b/patches.fixes/ext3-mark-super-uptodate index 1160f16c93..ebc1bd649f 100644 --- a/patches.fixes/ext3-mark-super-uptodate +++ b/patches.fixes/ext3-mark-super-uptodate @@ -24,7 +24,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com> --- a/fs/ext3/super.c +++ b/fs/ext3/super.c -@@ -2315,6 +2315,13 @@ static int ext3_commit_super(struct supe +@@ -2329,6 +2329,13 @@ static int ext3_commit_super(struct supe es->s_free_blocks_count = cpu_to_le32(ext3_count_free_blocks(sb)); es->s_free_inodes_count = cpu_to_le32(ext3_count_free_inodes(sb)); BUFFER_TRACE(sbh, "marking dirty"); diff --git a/patches.fixes/input-add-acer-aspire-5710-to-nomux.patch b/patches.fixes/input-add-acer-aspire-5710-to-nomux.patch index 48a2c2cc5d..d834249e48 100644 --- a/patches.fixes/input-add-acer-aspire-5710-to-nomux.patch +++ b/patches.fixes/input-add-acer-aspire-5710-to-nomux.patch @@ -14,7 +14,7 @@ Signed-off-by: Jiri Kosina <jkosina@suse.cz> --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h -@@ -340,6 +340,13 @@ static struct dmi_system_id __initdata i +@@ -348,6 +348,13 @@ static struct dmi_system_id __initdata i }, }, { diff --git a/patches.fixes/kdb-fix-stack-overflow.patch b/patches.fixes/kdb-fix-stack-overflow.patch index 42c4679e19..e0a3ecd98d 100644 --- a/patches.fixes/kdb-fix-stack-overflow.patch +++ b/patches.fixes/kdb-fix-stack-overflow.patch @@ -135,7 +135,7 @@ Acked-by: Bernhard Walle <bwalle@suse.de> if (!bp->bp_global) { --- a/kdb/kdbmain.c +++ b/kdb/kdbmain.c -@@ -3717,13 +3717,14 @@ kdb_per_cpu(int argc, const char **argv) +@@ -3716,13 +3716,14 @@ kdb_per_cpu(int argc, const char **argv) { char buf[256], fmtstr[64]; kdb_symtab_t symtab; @@ -151,7 +151,7 @@ Acked-by: Bernhard Walle <bwalle@suse.de> snprintf(buf, sizeof(buf), "per_cpu__%s", argv[1]); if (!kdbgetsymval(buf, &symtab)) { kdb_printf("%s is not a per_cpu variable\n", argv[1]); -@@ -3781,7 +3782,7 @@ kdb_per_cpu(int argc, const char **argv) +@@ -3780,7 +3781,7 @@ kdb_per_cpu(int argc, const char **argv) if (cpus_weight(suppress) == 0) return 0; kdb_printf("Zero suppressed cpu(s):"); @@ -160,7 +160,7 @@ Acked-by: Bernhard Walle <bwalle@suse.de> kdb_printf(" %d", cpu); if (cpu == NR_CPUS-1 || next_cpu(cpu, suppress) != cpu + 1) continue; -@@ -4236,10 +4237,9 @@ kdb_cpu_callback(struct notifier_block * +@@ -4235,10 +4236,9 @@ kdb_cpu_callback(struct notifier_block * if (action == CPU_ONLINE) { int cpu =(unsigned long)hcpu; cpumask_t save_cpus_allowed = current->cpus_allowed; diff --git a/patches.fixes/oom-warning b/patches.fixes/oom-warning index cbed04462f..a038d3d51c 100644 --- a/patches.fixes/oom-warning +++ b/patches.fixes/oom-warning @@ -13,7 +13,7 @@ Signed-off-by: Andrea Arcangeli <andrea@suse.de> --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -1837,7 +1837,13 @@ rebalance: +@@ -1850,7 +1850,13 @@ rebalance: nopage: if (!(gfp_mask & __GFP_NOWARN) && printk_ratelimit()) { diff --git a/patches.fixes/ptrace-getsiginfo b/patches.fixes/ptrace-getsiginfo index 4e7e04a692..c1863aaef4 100644 --- a/patches.fixes/ptrace-getsiginfo +++ b/patches.fixes/ptrace-getsiginfo @@ -22,7 +22,7 @@ Signed-off-by: Andreas Schwab <schwab@suse.de> #endif /* _PPC64_PPC32_H */ --- a/arch/powerpc/kernel/ptrace32.c +++ b/arch/powerpc/kernel/ptrace32.c -@@ -29,12 +29,15 @@ +@@ -28,12 +28,15 @@ #include <linux/security.h> #include <linux/signal.h> #include <linux/compat.h> @@ -38,7 +38,7 @@ Signed-off-by: Andreas Schwab <schwab@suse.de> /* * does not yet catch signals sent when the child dies. * in exit.c or in signal.c. -@@ -70,6 +73,27 @@ static long compat_ptrace_old(struct tas +@@ -69,6 +72,27 @@ static long compat_ptrace_old(struct tas #define FPRINDEX(i) TS_FPRWIDTH * FPRNUMBER(i) * 2 + FPRHALF(i) #define FPRINDEX_3264(i) (TS_FPRWIDTH * ((i) - PT_FPR0)) @@ -66,7 +66,7 @@ Signed-off-by: Andreas Schwab <schwab@suse.de> long compat_arch_ptrace(struct task_struct *child, compat_long_t request, compat_ulong_t caddr, compat_ulong_t cdata) { -@@ -297,6 +321,9 @@ long compat_arch_ptrace(struct task_stru +@@ -296,6 +320,9 @@ long compat_arch_ptrace(struct task_stru 0, PT_REGS_COUNT * sizeof(compat_long_t), compat_ptr(data)); diff --git a/patches.fixes/scsi-ibmvscsi-module_alias.patch b/patches.fixes/scsi-ibmvscsi-module_alias.patch index 42a3e6ae37..6156f35115 100644 --- a/patches.fixes/scsi-ibmvscsi-module_alias.patch +++ b/patches.fixes/scsi-ibmvscsi-module_alias.patch @@ -18,7 +18,7 @@ References: 459933 - LTC50724 MODULE_DESCRIPTION("IBM Virtual SCSI"); MODULE_AUTHOR("Dave Boutcher"); MODULE_LICENSE("GPL"); -@@ -1831,7 +1834,7 @@ static struct device_attribute *ibmvscsi +@@ -1836,7 +1839,7 @@ static struct device_attribute *ibmvscsi static struct scsi_host_template driver_template = { .module = THIS_MODULE, .name = "IBM POWER Virtual SCSI Adapter " IBMVSCSI_VERSION, @@ -27,7 +27,7 @@ References: 459933 - LTC50724 .queuecommand = ibmvscsi_queuecommand, .eh_abort_handler = ibmvscsi_eh_abort_handler, .eh_device_reset_handler = ibmvscsi_eh_device_reset_handler, -@@ -1999,7 +2002,7 @@ static struct vio_driver ibmvscsi_driver +@@ -2004,7 +2007,7 @@ static struct vio_driver ibmvscsi_driver .remove = ibmvscsi_remove, .get_desired_dma = ibmvscsi_get_desired_dma, .driver = { diff --git a/patches.fixes/scsi-ibmvscsi-show-config.patch b/patches.fixes/scsi-ibmvscsi-show-config.patch index b5340db116..26c121b6aa 100644 --- a/patches.fixes/scsi-ibmvscsi-show-config.patch +++ b/patches.fixes/scsi-ibmvscsi-show-config.patch @@ -28,7 +28,7 @@ Signed-off-by: Olaf Hering <olh@suse.de> static struct ibmvscsi_ops *ibmvscsi_ops; -@@ -1696,7 +1698,7 @@ static ssize_t show_host_srp_version(str +@@ -1701,7 +1703,7 @@ static ssize_t show_host_srp_version(str struct ibmvscsi_host_data *hostdata = shost_priv(shost); int len; @@ -37,7 +37,7 @@ Signed-off-by: Olaf Hering <olh@suse.de> hostdata->madapter_info.srp_version); return len; } -@@ -1717,7 +1719,7 @@ static ssize_t show_host_partition_name( +@@ -1722,7 +1724,7 @@ static ssize_t show_host_partition_name( struct ibmvscsi_host_data *hostdata = shost_priv(shost); int len; @@ -46,7 +46,7 @@ Signed-off-by: Olaf Hering <olh@suse.de> hostdata->madapter_info.partition_name); return len; } -@@ -1738,7 +1740,7 @@ static ssize_t show_host_partition_numbe +@@ -1743,7 +1745,7 @@ static ssize_t show_host_partition_numbe struct ibmvscsi_host_data *hostdata = shost_priv(shost); int len; @@ -55,7 +55,7 @@ Signed-off-by: Olaf Hering <olh@suse.de> hostdata->madapter_info.partition_number); return len; } -@@ -1758,7 +1760,7 @@ static ssize_t show_host_mad_version(str +@@ -1763,7 +1765,7 @@ static ssize_t show_host_mad_version(str struct ibmvscsi_host_data *hostdata = shost_priv(shost); int len; @@ -64,7 +64,7 @@ Signed-off-by: Olaf Hering <olh@suse.de> hostdata->madapter_info.mad_version); return len; } -@@ -1778,7 +1780,7 @@ static ssize_t show_host_os_type(struct +@@ -1783,7 +1785,7 @@ static ssize_t show_host_os_type(struct struct ibmvscsi_host_data *hostdata = shost_priv(shost); int len; @@ -73,7 +73,7 @@ Signed-off-by: Olaf Hering <olh@suse.de> return len; } -@@ -1797,7 +1799,7 @@ static ssize_t show_host_config(struct d +@@ -1802,7 +1804,7 @@ static ssize_t show_host_config(struct d struct ibmvscsi_host_data *hostdata = shost_priv(shost); /* returns null-terminated host config data */ diff --git a/patches.fixes/tiocgdev b/patches.fixes/tiocgdev index 9b0afe107f..a74184222d 100644 --- a/patches.fixes/tiocgdev +++ b/patches.fixes/tiocgdev @@ -144,7 +144,7 @@ add tty ioctl to figure physical device of the console. case TIOCSBRK: /* Turn break on, unconditionally */ --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c -@@ -1865,6 +1865,7 @@ COMPATIBLE_IOCTL(TCSETSW) +@@ -1866,6 +1866,7 @@ COMPATIBLE_IOCTL(TCSETSW) COMPATIBLE_IOCTL(TCSETSF) COMPATIBLE_IOCTL(TIOCLINUX) COMPATIBLE_IOCTL(TIOCSBRK) diff --git a/patches.fixes/tulip-quad-NIC-ifdown b/patches.fixes/tulip-quad-NIC-ifdown index 5cf7a29fba..d11d0b1730 100644 --- a/patches.fixes/tulip-quad-NIC-ifdown +++ b/patches.fixes/tulip-quad-NIC-ifdown @@ -13,7 +13,7 @@ Acked-by: Olaf Kirch <okir@suse.de> --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c -@@ -1805,6 +1805,10 @@ static void __devexit tulip_remove_one ( +@@ -1808,6 +1808,10 @@ static void __devexit tulip_remove_one ( return; tp = netdev_priv(dev); diff --git a/patches.fixes/use-totalram_pages b/patches.fixes/use-totalram_pages index 431302b388..07e611c92b 100644 --- a/patches.fixes/use-totalram_pages +++ b/patches.fixes/use-totalram_pages @@ -9,6 +9,31 @@ should likely even use (totalram_pages - totalhigh_pages). Acked-by: Rusty Russell <rusty@rustcorp.com.au> Acked-by: Ingo Molnar <mingo@elte.hu> +--- + arch/x86/kernel/microcode_core.c | 4 ++-- + drivers/char/agp/backend.c | 4 ++-- + drivers/parisc/ccio-dma.c | 4 ++-- + drivers/parisc/sba_iommu.c | 4 ++-- + drivers/xen/balloon.c | 4 ---- + fs/ntfs/malloc.h | 2 +- + include/linux/mm.h | 1 + + init/main.c | 4 ++-- + mm/memory_hotplug.c | 6 ++++-- + mm/slab.c | 2 +- + mm/swap.c | 2 +- + mm/vmalloc.c | 4 ++-- + net/core/sock.c | 4 ++-- + net/dccp/proto.c | 6 +++--- + net/decnet/dn_route.c | 2 +- + net/ipv4/route.c | 2 +- + net/ipv4/tcp.c | 4 ++-- + net/netfilter/nf_conntrack_core.c | 4 ++-- + net/netfilter/x_tables.c | 2 +- + net/netfilter/xt_hashlimit.c | 8 ++++---- + net/netlink/af_netlink.c | 6 +++--- + net/sctp/protocol.c | 6 +++--- + 22 files changed, 42 insertions(+), 43 deletions(-) + --- a/arch/x86/kernel/microcode_core.c +++ b/arch/x86/kernel/microcode_core.c @@ -210,8 +210,8 @@ static ssize_t microcode_write(struct fi @@ -58,7 +83,7 @@ Acked-by: Ingo Molnar <mingo@elte.hu> --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c -@@ -1390,7 +1390,7 @@ sba_ioc_init(struct parisc_device *sba, +@@ -1390,7 +1390,7 @@ sba_ioc_init(struct parisc_device *sba, ** for DMA hints - ergo only 30 bits max. */ @@ -67,7 +92,7 @@ Acked-by: Ingo Molnar <mingo@elte.hu> /* limit IOVA space size to 1MB-1GB */ if (iova_space_size < (1 << (20 - PAGE_SHIFT))) { -@@ -1415,7 +1415,7 @@ sba_ioc_init(struct parisc_device *sba, +@@ -1415,7 +1415,7 @@ sba_ioc_init(struct parisc_device *sba, DBG_INIT("%s() hpa 0x%lx mem %ldMB IOV %dMB (%d bits)\n", __func__, ioc->ioc_hpa, @@ -113,7 +138,7 @@ Acked-by: Ingo Molnar <mingo@elte.hu> --- a/init/main.c +++ b/init/main.c -@@ -727,12 +727,12 @@ asmlinkage void __init start_kernel(void +@@ -691,12 +691,12 @@ asmlinkage void __init start_kernel(void #endif thread_info_cache_init(); cred_init(); @@ -195,7 +220,7 @@ Acked-by: Ingo Molnar <mingo@elte.hu> area = __get_vm_area_node(size, VM_ALLOC, VMALLOC_START, VMALLOC_END, --- a/net/core/sock.c +++ b/net/core/sock.c -@@ -1195,12 +1195,12 @@ EXPORT_SYMBOL_GPL(sk_setup_caps); +@@ -1196,12 +1196,12 @@ EXPORT_SYMBOL_GPL(sk_setup_caps); void __init sk_init(void) { diff --git a/patches.fixes/xfs-redirty-ENOSPC.patch b/patches.fixes/xfs-redirty-ENOSPC.patch index 6a99477fb7..220a2e6c81 100644 --- a/patches.fixes/xfs-redirty-ENOSPC.patch +++ b/patches.fixes/xfs-redirty-ENOSPC.patch @@ -54,7 +54,7 @@ Signed-off-by: Olaf Hering <olh@suse.de> int need_trans; int delalloc, unmapped, unwritten; struct inode *inode = page->mapping->host; -@@ -1273,19 +1263,16 @@ xfs_vm_writepage( +@@ -1281,19 +1271,16 @@ xfs_vm_writepage( * to real space and flush out to disk. */ error = xfs_page_state_convert(inode, page, wbc, 1, unmapped); diff --git a/patches.kernel.org/arch-include-asm-fixes b/patches.kernel.org/arch-include-asm-fixes index 5d2a6f313c..f4d9e63038 100644 --- a/patches.kernel.org/arch-include-asm-fixes +++ b/patches.kernel.org/arch-include-asm-fixes @@ -57,7 +57,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com> --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile -@@ -108,4 +108,4 @@ archprepare: make_nr_irqs_h FORCE +@@ -103,4 +103,4 @@ archprepare: make_nr_irqs_h FORCE PHONY += make_nr_irqs_h FORCE make_nr_irqs_h: FORCE diff --git a/patches.kernel.org/md-section-conflict b/patches.kernel.org/md-section-conflict index c37ef52c82..495580cb7c 100644 --- a/patches.kernel.org/md-section-conflict +++ b/patches.kernel.org/md-section-conflict @@ -14,7 +14,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com> --- a/drivers/md/md.c +++ b/drivers/md/md.c -@@ -6896,11 +6896,11 @@ static __exit void md_exit(void) +@@ -6933,11 +6933,11 @@ static __exit void md_exit(void) subsys_initcall(md_init); module_exit(md_exit) diff --git a/patches.rpmify/spin_is_contended-fix b/patches.rpmify/spin_is_contended-fix index c3b270c853..b05f55fe25 100644 --- a/patches.rpmify/spin_is_contended-fix +++ b/patches.rpmify/spin_is_contended-fix @@ -102,7 +102,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com> bool --- a/arch/parisc/Kconfig +++ b/arch/parisc/Kconfig -@@ -31,7 +31,7 @@ config STACK_GROWSUP +@@ -33,7 +33,7 @@ config STACK_GROWSUP config GENERIC_LOCKBREAK bool default y diff --git a/patches.suse/block-add-mangle-devt-switch b/patches.suse/block-add-mangle-devt-switch index 5fed962d2a..b1ae5f105f 100644 --- a/patches.suse/block-add-mangle-devt-switch +++ b/patches.suse/block-add-mangle-devt-switch @@ -87,7 +87,7 @@ Signed-off-by: Tejun Heo <teheo@suse.de> static int sd_revalidate_disk(struct gendisk *); static int sd_probe(struct device *); -@@ -1972,7 +1968,7 @@ static void sd_probe_async(void *data, a +@@ -1988,7 +1984,7 @@ static void sd_probe_async(void *data, a if (index < SD_MAX_DISKS) { gd->major = sd_major((index & 0xf0) >> 4); gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00); @@ -96,7 +96,7 @@ Signed-off-by: Tejun Heo <teheo@suse.de> } gd->fops = &sd_fops; gd->private_data = &sdkp->driver; -@@ -2045,7 +2041,7 @@ static int sd_probe(struct device *dev) +@@ -2061,7 +2057,7 @@ static int sd_probe(struct device *dev) if (!sdkp) goto out; diff --git a/patches.suse/bootsplash b/patches.suse/bootsplash index 97c9a9977f..f3b089e9bc 100644 --- a/patches.suse/bootsplash +++ b/patches.suse/bootsplash @@ -50,7 +50,7 @@ Signed-off-by: mls@suse.de if (!sysrq_down) { --- a/drivers/char/n_tty.c +++ b/drivers/char/n_tty.c -@@ -1780,6 +1780,15 @@ do_it_again: +@@ -1777,6 +1777,15 @@ do_it_again: tty->minimum_to_wake = (minimum - (b - buf)); if (!input_available_p(tty, 0)) { @@ -68,7 +68,7 @@ Signed-off-by: mls@suse.de break; --- a/drivers/char/vt.c +++ b/drivers/char/vt.c -@@ -4071,6 +4071,31 @@ void vcs_scr_writew(struct vc_data *vc, +@@ -4066,6 +4066,31 @@ void vcs_scr_writew(struct vc_data *vc, } } @@ -102,7 +102,7 @@ Signed-off-by: mls@suse.de */ --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig -@@ -2158,4 +2158,8 @@ if FB || SGI_NEWPORT_CONSOLE +@@ -2161,4 +2161,8 @@ if FB || SGI_NEWPORT_CONSOLE source "drivers/video/logo/Kconfig" endif @@ -2663,11 +2663,10 @@ Signed-off-by: mls@suse.de err = take_over_console(&fb_con, first_fb_vc, last_fb_vc, fbcon_is_default); -@@ -1082,6 +1093,16 @@ static void fbcon_init(struct vc_data *v - new_rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres); +@@ -1083,6 +1094,16 @@ static void fbcon_init(struct vc_data *v new_cols /= vc->vc_font.width; new_rows /= vc->vc_font.height; -+ + +#ifdef CONFIG_BOOTSPLASH + if (vc->vc_splash_data && vc->vc_splash_data->splash_state) { + new_cols = vc->vc_splash_data->splash_text_wi / vc->vc_font.width; @@ -2677,9 +2676,10 @@ Signed-off-by: mls@suse.de + } +#endif + - ++ /* - * We must always set the mode. The mode of the previous console + * We must always set the mode. The mode of the previous console + * driver could be in the same resolution but we are using different @@ -1777,6 +1798,10 @@ static int fbcon_scroll(struct vc_data * fbcon_softback_note(vc, t, count); if (logo_shown >= 0) @@ -2817,7 +2817,7 @@ Signed-off-by: mls@suse.de if (size_remap < size_vmode) --- a/include/linux/console_struct.h +++ b/include/linux/console_struct.h -@@ -106,6 +106,9 @@ struct vc_data { +@@ -105,6 +105,9 @@ struct vc_data { struct vc_data **vc_display_fg; /* [!] Ptr to var holding fg console for this display */ unsigned long vc_uni_pagedir; unsigned long *vc_uni_pagedir_loc; /* [!] Location of uni_pagedir variable for this console */ diff --git a/patches.suse/cgroup-disable-memory.patch b/patches.suse/cgroup-disable-memory.patch index 2a0ad5c6c7..5703750312 100644 --- a/patches.suse/cgroup-disable-memory.patch +++ b/patches.suse/cgroup-disable-memory.patch @@ -37,7 +37,7 @@ Signed-off-by: Jiri Slaby <jslaby@suse.cz> Format: { "0" | "1" } --- a/kernel/cgroup.c +++ b/kernel/cgroup.c -@@ -3371,7 +3371,7 @@ static void cgroup_release_agent(struct +@@ -3440,7 +3440,7 @@ static void cgroup_release_agent(struct mutex_unlock(&cgroup_mutex); } @@ -46,7 +46,7 @@ Signed-off-by: Jiri Slaby <jslaby@suse.cz> { int i; char *token; -@@ -3384,17 +3384,26 @@ static int __init cgroup_disable(char *s +@@ -3453,17 +3453,26 @@ static int __init cgroup_disable(char *s struct cgroup_subsys *ss = subsys[i]; if (!strcmp(token, ss->name)) { @@ -78,7 +78,7 @@ Signed-off-by: Jiri Slaby <jslaby@suse.cz> */ --- a/mm/memcontrol.c +++ b/mm/memcontrol.c -@@ -2615,6 +2615,7 @@ struct cgroup_subsys mem_cgroup_subsys = +@@ -2632,6 +2632,7 @@ struct cgroup_subsys mem_cgroup_subsys = .attach = mem_cgroup_move_task, .early_init = 0, .use_id = 1, diff --git a/patches.suse/crasher-26.diff b/patches.suse/crasher-26.diff index f704d254c6..3f5ca6660c 100644 --- a/patches.suse/crasher-26.diff +++ b/patches.suse/crasher-26.diff @@ -9,7 +9,7 @@ Subject: slab testing module --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig -@@ -1114,5 +1114,10 @@ config DEVPORT +@@ -1110,5 +1110,10 @@ config DEVPORT source "drivers/s390/char/Kconfig" @@ -22,7 +22,7 @@ Subject: slab testing module --- a/drivers/char/Makefile +++ b/drivers/char/Makefile -@@ -106,6 +106,7 @@ obj-$(CONFIG_IPMI_HANDLER) += ipmi/ +@@ -105,6 +105,7 @@ obj-$(CONFIG_IPMI_HANDLER) += ipmi/ obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o obj-$(CONFIG_TCG_TPM) += tpm/ diff --git a/patches.suse/dm-raid45_2.6.27_20081027.patch b/patches.suse/dm-raid45_2.6.27_20081027.patch index 88d145fdd9..448243572a 100644 --- a/patches.suse/dm-raid45_2.6.27_20081027.patch +++ b/patches.suse/dm-raid45_2.6.27_20081027.patch @@ -5443,7 +5443,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> --- a/drivers/md/dm.c +++ b/drivers/md/dm.c -@@ -2573,6 +2573,7 @@ struct gendisk *dm_disk(struct mapped_de +@@ -2568,6 +2568,7 @@ struct gendisk *dm_disk(struct mapped_de { return md->disk; } diff --git a/patches.suse/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch b/patches.suse/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch index 4d509eebb0..f266a6e2fb 100644 --- a/patches.suse/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch +++ b/patches.suse/driver-core-devtmpfs-driver-core-maintained-dev-tmpfs.patch @@ -512,7 +512,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> classes_init(); --- a/include/linux/device.h +++ b/include/linux/device.h -@@ -548,6 +548,16 @@ extern void put_device(struct device *de +@@ -546,6 +546,16 @@ extern void put_device(struct device *de extern void wait_for_device_probe(void); @@ -562,7 +562,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include <trace/boot.h> #include <asm/io.h> -@@ -843,6 +844,7 @@ static void __init do_basic_setup(void) +@@ -844,6 +845,7 @@ static void __init do_basic_setup(void) init_workqueues(); cpuset_init_smp(); usermodehelper_init(); diff --git a/patches.suse/ext3-barrier-default b/patches.suse/ext3-barrier-default index 216e134584..b4c23248af 100644 --- a/patches.suse/ext3-barrier-default +++ b/patches.suse/ext3-barrier-default @@ -22,7 +22,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> --- a/fs/ext3/Kconfig +++ b/fs/ext3/Kconfig -@@ -47,6 +47,28 @@ config EXT3_DEFAULTS_TO_ORDERED +@@ -49,6 +49,28 @@ config EXT3_DEFAULTS_TO_ORDERED privacy issues of data=writeback and are willing to make that trade off, answer 'n'. @@ -74,7 +74,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> return ret; --- a/fs/ext3/super.c +++ b/fs/ext3/super.c -@@ -1636,6 +1636,10 @@ static int ext3_fill_super (struct super +@@ -1650,6 +1650,10 @@ static int ext3_fill_super (struct super sbi->s_resuid = le16_to_cpu(es->s_def_resuid); sbi->s_resgid = le16_to_cpu(es->s_def_resgid); diff --git a/patches.suse/file-capabilities-disable-by-default.diff b/patches.suse/file-capabilities-disable-by-default.diff index 089b4a738e..84260f3c6d 100644 --- a/patches.suse/file-capabilities-disable-by-default.diff +++ b/patches.suse/file-capabilities-disable-by-default.diff @@ -13,7 +13,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -1603,7 +1603,13 @@ and is between 256 and 4096 characters. +@@ -1607,7 +1607,13 @@ and is between 256 and 4096 characters. no_file_caps Tells the kernel not to honor file capabilities. The only way then for a file to be executed with privilege diff --git a/patches.suse/kbuild-generate-modules.builtin b/patches.suse/kbuild-generate-modules.builtin index 7e052c9e02..002c613e9e 100644 --- a/patches.suse/kbuild-generate-modules.builtin +++ b/patches.suse/kbuild-generate-modules.builtin @@ -33,7 +33,7 @@ Signed-off-by: Michal Marek <mmarek@suse.cz> *.gz --- a/Makefile +++ b/Makefile -@@ -875,6 +875,9 @@ $(sort $(vmlinux-init) $(vmlinux-main)) +@@ -876,6 +876,9 @@ $(sort $(vmlinux-init) $(vmlinux-main)) PHONY += $(vmlinux-dirs) $(vmlinux-dirs): prepare scripts $(Q)$(MAKE) $(build)=$@ @@ -43,7 +43,7 @@ Signed-off-by: Michal Marek <mmarek@suse.cz> # Build the kernel release string # -@@ -1141,6 +1144,7 @@ all: modules +@@ -1142,6 +1145,7 @@ all: modules PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order @@ -51,7 +51,7 @@ Signed-off-by: Michal Marek <mmarek@suse.cz> @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild -@@ -1169,7 +1173,7 @@ _modinst_: +@@ -1170,7 +1174,7 @@ _modinst_: rm -f $(MODLIB)/build ; \ ln -s $(objtree) $(MODLIB)/build ; \ fi @@ -60,7 +60,7 @@ Signed-off-by: Michal Marek <mmarek@suse.cz> $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst # This depmod is only for convenience to give the initial -@@ -1232,7 +1236,8 @@ clean: archclean $(clean-dirs) +@@ -1233,7 +1237,8 @@ clean: archclean $(clean-dirs) \( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \ -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \ -o -name '*.symtypes' -o -name 'modules.order' \ @@ -70,7 +70,7 @@ Signed-off-by: Michal Marek <mmarek@suse.cz> -o -name '*.gcno' \) -type f -print | xargs rm -f # mrproper - Delete all generated files, including .config -@@ -1431,7 +1436,8 @@ $(clean-dirs): +@@ -1432,7 +1437,8 @@ $(clean-dirs): clean: rm-dirs := $(MODVERDIR) clean: rm-files := $(KBUILD_EXTMOD)/Module.symvers \ $(KBUILD_EXTMOD)/Module.markers \ diff --git a/patches.suse/kdb-common b/patches.suse/kdb-common index aaafbd4122..271fc95ab6 100644 --- a/patches.suse/kdb-common +++ b/patches.suse/kdb-common @@ -5161,7 +5161,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> if (!sysrq_down) { --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c -@@ -47,6 +47,10 @@ +@@ -46,6 +46,10 @@ #define DRIVER_DESC "USB HID core driver" #define DRIVER_LICENSE "GPL" @@ -5172,7 +5172,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> /* * Module parameters. */ -@@ -1037,6 +1041,14 @@ static void usbhid_stop(struct hid_devic +@@ -1036,6 +1040,14 @@ static void usbhid_stop(struct hid_devic if (WARN_ON(!usbhid)) return; @@ -5187,7 +5187,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> clear_bit(HID_STARTED, &usbhid->iofl); spin_lock_irq(&usbhid->lock); /* Sync with error handler */ -@@ -1176,6 +1188,23 @@ static int hid_probe(struct usb_interfac +@@ -1175,6 +1187,23 @@ static int hid_probe(struct usb_interfac goto err_free; } @@ -5510,7 +5510,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) --- a/drivers/usb/core/hcd.h +++ b/drivers/usb/core/hcd.h -@@ -263,6 +263,10 @@ struct hc_driver { +@@ -267,6 +267,10 @@ struct hc_driver { void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *); /* Returns the hardware-chosen device address */ int (*address_device)(struct usb_hcd *, struct usb_device *udev); @@ -5585,10 +5585,10 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> /*-------------------------------------------------------------------------*/ /* called after powerup, by probe or system-pm "wakeup" */ -@@ -404,6 +408,10 @@ static const struct hc_driver ehci_pci_h +@@ -406,6 +410,10 @@ static const struct hc_driver ehci_pci_h .port_handed_over = ehci_port_handed_over, - - .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, + + .clear_tt_buffer_complete = ehci_clear_tt_buffer_complete, + +#ifdef CONFIG_KDB_USB + .kdb_poll_char = ehci_kdb_poll_char, @@ -5598,7 +5598,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> /*-------------------------------------------------------------------------*/ --- a/drivers/usb/host/ehci-q.c +++ b/drivers/usb/host/ehci-q.c -@@ -483,6 +483,228 @@ halt: +@@ -541,6 +541,228 @@ halt: return count; } @@ -31644,7 +31644,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> mutex_unlock(&kexec_mutex); --- a/kernel/module.c +++ b/kernel/module.c -@@ -2681,12 +2681,23 @@ out: +@@ -2696,12 +2696,23 @@ out: return -ERANGE; } @@ -31669,7 +31669,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> list_for_each_entry_rcu(mod, &modules, list) { if (symnum < mod->num_symtab) { *value = mod->symtab[symnum].st_value; -@@ -2695,12 +2706,14 @@ int module_get_kallsym(unsigned int symn +@@ -2710,12 +2721,14 @@ int module_get_kallsym(unsigned int symn KSYM_NAME_LEN); strlcpy(module_name, mod->name, MODULE_NAME_LEN); *exported = is_exported(name, *value, mod); @@ -31712,7 +31712,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> * everything else. --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -9489,7 +9489,7 @@ void normalize_rt_tasks(void) +@@ -9516,7 +9516,7 @@ void normalize_rt_tasks(void) #endif /* CONFIG_MAGIC_SYSRQ */ @@ -31721,7 +31721,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> /* * These functions are only useful for the IA64 MCA handling. * -@@ -10582,3 +10582,94 @@ struct cgroup_subsys cpuacct_subsys = { +@@ -10609,3 +10609,94 @@ struct cgroup_subsys cpuacct_subsys = { .subsys_id = cpuacct_subsys_id, }; #endif /* CONFIG_CGROUP_CPUACCT */ @@ -31818,7 +31818,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> +#endif /* CONFIG_KDB */ --- a/kernel/signal.c +++ b/kernel/signal.c -@@ -2696,3 +2696,52 @@ void __init signals_init(void) +@@ -2699,3 +2699,52 @@ void __init signals_init(void) { sigqueue_cachep = KMEM_CACHE(sigqueue, SLAB_PANIC); } diff --git a/patches.suse/kdb-ia64 b/patches.suse/kdb-ia64 index b5c32959b4..0f3015f018 100644 --- a/patches.suse/kdb-ia64 +++ b/patches.suse/kdb-ia64 @@ -151,7 +151,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> endmenu --- a/arch/ia64/Makefile +++ b/arch/ia64/Makefile -@@ -63,6 +63,7 @@ core-$(CONFIG_IA64_SGI_UV) += arch/ia64/ +@@ -58,6 +58,7 @@ core-$(CONFIG_IA64_SGI_UV) += arch/ia64/ core-$(CONFIG_KVM) += arch/ia64/kvm/ core-$(CONFIG_XEN) += arch/ia64/xen/ diff --git a/patches.suse/kdb-x86 b/patches.suse/kdb-x86 index 43d48f5ff9..abf23520ef 100644 --- a/patches.suse/kdb-x86 +++ b/patches.suse/kdb-x86 @@ -26895,7 +26895,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> */ --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c -@@ -3,6 +3,10 @@ +@@ -4,6 +4,10 @@ #include <linux/pm.h> #include <linux/efi.h> #include <linux/dmi.h> @@ -26906,7 +26906,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> #include <acpi/reboot.h> #include <asm/io.h> #include <asm/apic.h> -@@ -545,6 +549,14 @@ void native_machine_shutdown(void) +@@ -593,6 +597,14 @@ void native_machine_shutdown(void) /* Make certain I only run on the appropriate processor */ set_cpus_allowed_ptr(current, cpumask_of(reboot_cpu_id)); @@ -26921,7 +26921,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> /* O.K Now that I'm on the appropriate processor, * stop all of the others. */ -@@ -651,6 +663,29 @@ static nmi_shootdown_cb shootdown_callba +@@ -699,6 +711,29 @@ static nmi_shootdown_cb shootdown_callba static atomic_t waiting_for_crash_ipi; @@ -26930,7 +26930,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> +{ +#ifdef CONFIG_X86_32 + struct pt_regs fixed_regs; -+#endif ++#endif + local_irq_disable(); +#ifdef CONFIG_X86_32 + if (!user_mode_vm(regs)) { diff --git a/patches.suse/nfs4acl-ext3.diff b/patches.suse/nfs4acl-ext3.diff index a3f2c82c50..7ed9ba7f87 100644 --- a/patches.suse/nfs4acl-ext3.diff +++ b/patches.suse/nfs4acl-ext3.diff @@ -28,7 +28,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> --- a/fs/ext3/Kconfig +++ b/fs/ext3/Kconfig -@@ -95,6 +95,13 @@ config EXT3_FS_POSIX_ACL +@@ -97,6 +97,13 @@ config EXT3_FS_POSIX_ACL If you don't know what Access Control Lists are, say N @@ -144,7 +144,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> static int ext3_writepage_trans_blocks(struct inode *inode); -@@ -2752,6 +2753,9 @@ struct inode *ext3_iget(struct super_blo +@@ -2746,6 +2747,9 @@ struct inode *ext3_iget(struct super_blo return inode; ei = EXT3_I(inode); @@ -154,7 +154,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> ei->i_block_alloc_info = NULL; ret = __ext3_get_inode_loc(inode, &iloc, 0); -@@ -3052,6 +3056,65 @@ int ext3_write_inode(struct inode *inode +@@ -3046,6 +3050,65 @@ int ext3_write_inode(struct inode *inode return ext3_force_commit(inode->i_sb); } @@ -220,7 +220,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> /* * ext3_setattr() * -@@ -3075,7 +3138,7 @@ int ext3_setattr(struct dentry *dentry, +@@ -3069,7 +3132,7 @@ int ext3_setattr(struct dentry *dentry, int error, rc = 0; const unsigned int ia_valid = attr->ia_valid; @@ -229,7 +229,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> if (error) return error; -@@ -3126,8 +3189,12 @@ int ext3_setattr(struct dentry *dentry, +@@ -3120,8 +3183,12 @@ int ext3_setattr(struct dentry *dentry, rc = inode_setattr(inode, attr); @@ -749,7 +749,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> ext3_discard_reservation(inode); EXT3_I(inode)->i_block_alloc_info = NULL; if (unlikely(rsv)) -@@ -771,7 +783,7 @@ enum { +@@ -779,7 +791,7 @@ enum { Opt_bsd_df, Opt_minix_df, Opt_grpid, Opt_nogrpid, Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic, Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, @@ -758,7 +758,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> Opt_reservation, Opt_noreservation, Opt_noload, Opt_nobh, Opt_bh, Opt_commit, Opt_journal_update, Opt_journal_inum, Opt_journal_dev, Opt_abort, Opt_data_journal, Opt_data_ordered, Opt_data_writeback, -@@ -804,6 +816,7 @@ static const match_table_t tokens = { +@@ -812,6 +824,7 @@ static const match_table_t tokens = { {Opt_user_xattr, "user_xattr"}, {Opt_nouser_xattr, "nouser_xattr"}, {Opt_acl, "acl"}, @@ -766,7 +766,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> {Opt_noacl, "noacl"}, {Opt_reservation, "reservation"}, {Opt_noreservation, "noreservation"}, -@@ -949,19 +962,33 @@ static int parse_options (char *options, +@@ -957,19 +970,33 @@ static int parse_options (char *options, printk("EXT3 (no)user_xattr options not supported\n"); break; #endif @@ -808,7 +808,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> case Opt_reservation: set_opt(sbi->s_mount_opt, RESERVATION); break; -@@ -1646,8 +1673,11 @@ static int ext3_fill_super (struct super +@@ -1660,8 +1687,11 @@ static int ext3_fill_super (struct super NULL, 0)) goto failed_mount; @@ -822,7 +822,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> if (le32_to_cpu(es->s_rev_level) == EXT3_GOOD_OLD_REV && (EXT3_HAS_COMPAT_FEATURE(sb, ~0U) || -@@ -2511,8 +2541,12 @@ static int ext3_remount (struct super_bl +@@ -2525,8 +2555,12 @@ static int ext3_remount (struct super_bl if (sbi->s_mount_opt & EXT3_MOUNT_ABORT) ext3_abort(sb, __func__, "Abort forced by user"); diff --git a/patches.suse/novfs-client-module b/patches.suse/novfs-client-module index 5cecb907e9..ebf860505d 100644 --- a/patches.suse/novfs-client-module +++ b/patches.suse/novfs-client-module @@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/fs/Kconfig +++ b/fs/Kconfig -@@ -282,6 +282,7 @@ source "fs/ncpfs/Kconfig" +@@ -257,6 +257,7 @@ source "fs/ncpfs/Kconfig" source "fs/coda/Kconfig" source "fs/afs/Kconfig" source "fs/9p/Kconfig" diff --git a/patches.suse/of_platform_driver.module-owner.patch b/patches.suse/of_platform_driver.module-owner.patch index 8fcc48b37a..c33ab490b5 100644 --- a/patches.suse/of_platform_driver.module-owner.patch +++ b/patches.suse/of_platform_driver.module-owner.patch @@ -355,7 +355,7 @@ From: olh@suse.de .driver = { --- a/arch/sparc/kernel/time_64.c +++ b/arch/sparc/kernel/time_64.c -@@ -463,6 +463,7 @@ static struct of_device_id __initdata rt +@@ -462,6 +462,7 @@ static struct of_device_id __initdata rt }; static struct of_platform_driver rtc_driver = { @@ -363,7 +363,7 @@ From: olh@suse.de .match_table = rtc_match, .probe = rtc_probe, .driver = { -@@ -495,6 +496,7 @@ static struct of_device_id __initdata bq +@@ -494,6 +495,7 @@ static struct of_device_id __initdata bq }; static struct of_platform_driver bq4802_driver = { @@ -371,7 +371,7 @@ From: olh@suse.de .match_table = bq4802_match, .probe = bq4802_probe, .driver = { -@@ -558,6 +560,7 @@ static struct of_device_id __initdata mo +@@ -557,6 +559,7 @@ static struct of_device_id __initdata mo }; static struct of_platform_driver mostek_driver = { @@ -461,7 +461,7 @@ From: olh@suse.de .probe = talitos_probe, --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c -@@ -1032,6 +1032,7 @@ static struct of_device_id of_fsl_dma_id +@@ -1039,6 +1039,7 @@ static struct of_device_id of_fsl_dma_id }; static struct of_platform_driver of_fsl_dma_driver = { @@ -481,7 +481,7 @@ From: olh@suse.de .probe = env_probe, --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c -@@ -806,6 +806,7 @@ static const struct of_device_id ibm_iic +@@ -807,6 +807,7 @@ static const struct of_device_id ibm_iic }; static struct of_platform_driver ibm_iic_driver = { @@ -569,7 +569,7 @@ From: olh@suse.de .probe = therm_of_probe, --- a/drivers/mmc/host/sdhci-of.c +++ b/drivers/mmc/host/sdhci-of.c -@@ -293,6 +293,7 @@ static const struct of_device_id sdhci_o +@@ -301,6 +301,7 @@ static const struct of_device_id sdhci_o MODULE_DEVICE_TABLE(of, sdhci_of_match); static struct of_platform_driver sdhci_of_driver = { @@ -709,7 +709,7 @@ From: olh@suse.de .remove = fsl_pq_mdio_remove, --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c -@@ -2337,6 +2337,7 @@ static struct of_device_id gfar_match[] +@@ -2340,6 +2340,7 @@ static struct of_device_id gfar_match[] /* Structure for a device driver */ static struct of_platform_driver gfar_driver = { @@ -719,7 +719,7 @@ From: olh@suse.de --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c -@@ -2988,6 +2988,7 @@ static struct of_device_id emac_match[] +@@ -2990,6 +2990,7 @@ static struct of_device_id emac_match[] }; static struct of_platform_driver emac_driver = { @@ -739,7 +739,7 @@ From: olh@suse.de --- a/drivers/net/ibm_newemac/rgmii.c +++ b/drivers/net/ibm_newemac/rgmii.c -@@ -317,6 +317,7 @@ static struct of_device_id rgmii_match[] +@@ -318,6 +318,7 @@ static struct of_device_id rgmii_match[] }; static struct of_platform_driver rgmii_driver = { @@ -789,7 +789,7 @@ From: olh@suse.de .probe = niu_of_probe, --- a/drivers/net/phy/mdio-gpio.c +++ b/drivers/net/phy/mdio-gpio.c -@@ -245,6 +245,7 @@ static struct of_device_id mdio_ofgpio_m +@@ -240,6 +240,7 @@ static struct of_device_id mdio_ofgpio_m }; static struct of_platform_driver mdio_ofgpio_driver = { @@ -839,7 +839,7 @@ From: olh@suse.de .probe = qec_sbus_probe, --- a/drivers/net/ucc_geth.c +++ b/drivers/net/ucc_geth.c -@@ -3856,6 +3856,7 @@ static struct of_device_id ucc_geth_matc +@@ -3848,6 +3848,7 @@ static struct of_device_id ucc_geth_matc MODULE_DEVICE_TABLE(of, ucc_geth_match); static struct of_platform_driver ucc_geth_driver = { diff --git a/patches.suse/osync-error b/patches.suse/osync-error index 1a53237421..6863eef33a 100644 --- a/patches.suse/osync-error +++ b/patches.suse/osync-error @@ -13,7 +13,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> --- a/mm/filemap.c +++ b/mm/filemap.c -@@ -2324,7 +2324,7 @@ generic_file_buffered_write(struct kiocb +@@ -2325,7 +2325,7 @@ generic_file_buffered_write(struct kiocb if (likely(status >= 0)) { written += status; @@ -22,7 +22,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> /* * For now, when the user asks for O_SYNC, we'll actually give -@@ -2342,10 +2342,23 @@ generic_file_buffered_write(struct kiocb +@@ -2343,10 +2343,23 @@ generic_file_buffered_write(struct kiocb * to buffered writes (block instantiation inside i_size). So we sync * the file data here, to try to honour O_DIRECT expectations. */ diff --git a/patches.suse/raw_device_max_minors_param.diff b/patches.suse/raw_device_max_minors_param.diff index 847e22ff0b..8bf3c55304 100644 --- a/patches.suse/raw_device_max_minors_param.diff +++ b/patches.suse/raw_device_max_minors_param.diff @@ -16,7 +16,7 @@ Signed-off-by: Jan Kara <jack@suse.cz> --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig -@@ -1045,7 +1045,7 @@ config RAW_DRIVER +@@ -1041,7 +1041,7 @@ config RAW_DRIVER with the O_DIRECT flag. config MAX_RAW_DEVS diff --git a/patches.suse/reiser4-set_page_dirty_notag b/patches.suse/reiser4-set_page_dirty_notag index df241b7528..25f6254c4a 100644 --- a/patches.suse/reiser4-set_page_dirty_notag +++ b/patches.suse/reiser4-set_page_dirty_notag @@ -15,7 +15,7 @@ Acked-by: Jeff Mahoney <jeffm@suse.com> --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -841,6 +841,7 @@ int redirty_page_for_writepage(struct wr +@@ -826,6 +826,7 @@ int redirty_page_for_writepage(struct wr void account_page_dirtied(struct page *page, struct address_space *mapping); int set_page_dirty(struct page *page); int set_page_dirty_lock(struct page *page); diff --git a/patches.suse/reiserfs-barrier-default b/patches.suse/reiserfs-barrier-default index 437d201203..00e3d4ca36 100644 --- a/patches.suse/reiserfs-barrier-default +++ b/patches.suse/reiserfs-barrier-default @@ -43,7 +43,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com> depends on REISERFS_FS --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c -@@ -1620,6 +1620,9 @@ static int reiserfs_fill_super(struct su +@@ -1619,6 +1619,9 @@ static int reiserfs_fill_super(struct su /* Set default values for options: non-aggressive tails, RO on errors */ REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_SMALLTAIL); REISERFS_SB(s)->s_mount_opt |= (1 << REISERFS_ERROR_RO); diff --git a/patches.suse/self-ptrace.patch b/patches.suse/self-ptrace.patch index b87ffc12f3..e2e3a42d33 100644 --- a/patches.suse/self-ptrace.patch +++ b/patches.suse/self-ptrace.patch @@ -91,7 +91,7 @@ Acked-by: John Jolly <jjolly@suse.de> extern int ptrace_traceme(void); --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1470,6 +1470,7 @@ struct task_struct { +@@ -1480,6 +1480,7 @@ struct task_struct { /* bitmask of trace recursion */ unsigned long trace_recursion; #endif /* CONFIG_TRACING */ diff --git a/patches.suse/setuid-dumpable-wrongdir b/patches.suse/setuid-dumpable-wrongdir index b9c58eeab0..76b9473f76 100644 --- a/patches.suse/setuid-dumpable-wrongdir +++ b/patches.suse/setuid-dumpable-wrongdir @@ -22,7 +22,7 @@ Signed-off-by: Kurt Garloff <garloff@suse.de> --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -807,6 +807,14 @@ static struct ctl_table kern_table[] = { +@@ -808,6 +808,14 @@ static struct ctl_table kern_table[] = { .proc_handler = &proc_dointvec, }, #endif diff --git a/patches.suse/stack-unwind b/patches.suse/stack-unwind index 81bee0927b..0af735d740 100644 --- a/patches.suse/stack-unwind +++ b/patches.suse/stack-unwind @@ -45,7 +45,7 @@ Update Jan 17 2009 jeffm: KBUILD_AFLAGS += -gdwarf-2 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig -@@ -441,7 +441,7 @@ config X86_ES7000 +@@ -442,7 +442,7 @@ config X86_ES7000 config SCHED_OMIT_FRAME_POINTER def_bool y prompt "Single-depth WCHAN output" @@ -763,7 +763,7 @@ Update Jan 17 2009 jeffm: #include <linux/rculist.h> #include <asm/uaccess.h> #include <asm/cacheflush.h> -@@ -1536,6 +1537,8 @@ static void free_module(struct module *m +@@ -1549,6 +1550,8 @@ static void free_module(struct module *m remove_sect_attrs(mod); mod_kobject_remove(mod); @@ -772,7 +772,7 @@ Update Jan 17 2009 jeffm: /* Arch-specific cleanup. */ module_arch_cleanup(mod); -@@ -1975,6 +1978,7 @@ static noinline struct module *load_modu +@@ -1988,6 +1991,7 @@ static noinline struct module *load_modu unsigned int symindex = 0; unsigned int strindex = 0; unsigned int modindex, versindex, infoindex, pcpuindex; @@ -780,7 +780,7 @@ Update Jan 17 2009 jeffm: struct module *mod; long err = 0; void *percpu = NULL, *ptr = NULL; /* Stops spurious gcc warning */ -@@ -2055,6 +2059,9 @@ static noinline struct module *load_modu +@@ -2068,6 +2072,9 @@ static noinline struct module *load_modu versindex = find_sec(hdr, sechdrs, secstrings, "__versions"); infoindex = find_sec(hdr, sechdrs, secstrings, ".modinfo"); pcpuindex = find_pcpusec(hdr, sechdrs, secstrings); @@ -790,7 +790,7 @@ Update Jan 17 2009 jeffm: /* Don't keep modinfo and version sections. */ sechdrs[infoindex].sh_flags &= ~(unsigned long)SHF_ALLOC; -@@ -2064,6 +2071,8 @@ static noinline struct module *load_modu +@@ -2077,6 +2084,8 @@ static noinline struct module *load_modu sechdrs[symindex].sh_flags |= SHF_ALLOC; sechdrs[strindex].sh_flags |= SHF_ALLOC; #endif @@ -799,7 +799,7 @@ Update Jan 17 2009 jeffm: /* Check module struct version now, before we try to use module. */ if (!check_modstruct_version(sechdrs, versindex, mod)) { -@@ -2414,6 +2423,11 @@ static noinline struct module *load_modu +@@ -2429,6 +2438,11 @@ static noinline struct module *load_modu } #endif @@ -811,7 +811,7 @@ Update Jan 17 2009 jeffm: /* Get rid of temporary copy */ vfree(hdr); -@@ -2532,6 +2546,7 @@ SYSCALL_DEFINE3(init_module, void __user +@@ -2547,6 +2561,7 @@ SYSCALL_DEFINE3(init_module, void __user /* Drop initial reference. */ module_put(mod); trim_init_extable(mod); diff --git a/patches.suse/supported-flag b/patches.suse/supported-flag index 202cba87b4..aa6ec647b2 100644 --- a/patches.suse/supported-flag +++ b/patches.suse/supported-flag @@ -26,7 +26,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -2407,6 +2407,12 @@ and is between 256 and 4096 characters. +@@ -2411,6 +2411,12 @@ and is between 256 and 4096 characters. pernode one pool for each NUMA node (equivalent to global on non-NUMA machines) @@ -121,7 +121,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> /* List of modules, protected by module_mutex or preempt_disable * (delete uses stop_machine/add uses RCU list operations). */ DEFINE_MUTEX(module_mutex); -@@ -1930,7 +1944,7 @@ static noinline struct module *load_modu +@@ -1937,7 +1951,7 @@ static noinline struct module *load_modu Elf_Ehdr *hdr; Elf_Shdr *sechdrs; char *secstrings, *args, *modmagic, *strtab = NULL; @@ -130,7 +130,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> unsigned int i; unsigned int symindex = 0; unsigned int strindex = 0; -@@ -2052,6 +2066,28 @@ static noinline struct module *load_modu +@@ -2059,6 +2073,28 @@ static noinline struct module *load_modu mod->name); } @@ -159,7 +159,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> /* Now copy in args */ args = strndup_user(uargs, ~0UL >> 1); if (IS_ERR(args)) { -@@ -2712,6 +2748,10 @@ static char *module_flags(struct module +@@ -2719,6 +2755,10 @@ static char *module_flags(struct module buf[bx++] = 'F'; if (mod->taints & (1 << TAINT_CRAP)) buf[bx++] = 'C'; @@ -192,7 +192,7 @@ Signed-off-by: Andreas Gruenbacher <agruen@suse.de> */ --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -618,6 +618,16 @@ static struct ctl_table kern_table[] = { +@@ -619,6 +619,16 @@ static struct ctl_table kern_table[] = { .mode = 0644, .proc_handler = &proc_dointvec, }, diff --git a/patches.suse/suse-ppc32-mol-handle-mm-fault b/patches.suse/suse-ppc32-mol-handle-mm-fault index 083c38ddb1..018c6c873b 100644 --- a/patches.suse/suse-ppc32-mol-handle-mm-fault +++ b/patches.suse/suse-ppc32-mol-handle-mm-fault @@ -15,7 +15,7 @@ Signed-off-by: Jeff Mahoney <jeffm@suse.com> --- a/mm/memory.c +++ b/mm/memory.c -@@ -2986,6 +2986,7 @@ int handle_mm_fault(struct mm_struct *mm +@@ -2987,6 +2987,7 @@ int handle_mm_fault(struct mm_struct *mm return handle_pte_fault(mm, vma, address, pte, pmd, flags); } diff --git a/patches.suse/sysctl-add-affinity_load_balancing b/patches.suse/sysctl-add-affinity_load_balancing index 40fff34cec..738a0b296d 100644 --- a/patches.suse/sysctl-add-affinity_load_balancing +++ b/patches.suse/sysctl-add-affinity_load_balancing @@ -25,7 +25,7 @@ usage: --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -2307,6 +2307,28 @@ find_idlest_cpu(struct sched_group *grou +@@ -2308,6 +2308,28 @@ find_idlest_cpu(struct sched_group *grou return idlest; } @@ -54,7 +54,7 @@ usage: /* * sched_balance_self: balance the current task (running on cpu) in domains * that have the 'flag' flag set. In practice, this is SD_BALANCE_FORK and -@@ -2318,11 +2340,17 @@ find_idlest_cpu(struct sched_group *grou +@@ -2319,11 +2341,17 @@ find_idlest_cpu(struct sched_group *grou * * preempt must be disabled. */ @@ -74,7 +74,7 @@ usage: * If power savings logic is enabled for a domain, stop there. --- a/kernel/sysctl.c +++ b/kernel/sysctl.c -@@ -244,6 +244,8 @@ static int min_wakeup_granularity_ns; +@@ -245,6 +245,8 @@ static int min_wakeup_granularity_ns; static int max_wakeup_granularity_ns = NSEC_PER_SEC; /* 1 second */ #endif @@ -83,7 +83,7 @@ usage: static struct ctl_table kern_table[] = { #ifdef CONFIG_SCHED_DEBUG { -@@ -1012,6 +1014,16 @@ static struct ctl_table kern_table[] = { +@@ -1013,6 +1015,16 @@ static struct ctl_table kern_table[] = { * NOTE: do not add new entries to this table unless you have read * Documentation/sysctl/ctl_unnumbered.txt */ diff --git a/patches.suse/twofish-2.6 b/patches.suse/twofish-2.6 index 74b4ecd03c..93fb8d414e 100644 --- a/patches.suse/twofish-2.6 +++ b/patches.suse/twofish-2.6 @@ -11,7 +11,7 @@ See $subject, used up to 9.2 on new installs. --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig -@@ -434,6 +434,12 @@ config SUNVDC +@@ -450,6 +450,12 @@ config SUNVDC Support for virtual disk devices as a client under Sun Logical Domains. @@ -26,7 +26,7 @@ See $subject, used up to 9.2 on new installs. config XILINX_SYSACE --- a/drivers/block/Makefile +++ b/drivers/block/Makefile -@@ -35,5 +35,6 @@ obj-$(CONFIG_BLK_DEV_UB) += ub.o +@@ -36,5 +36,6 @@ obj-$(CONFIG_BLK_DEV_UB) += ub.o obj-$(CONFIG_BLK_DEV_HD) += hd.o obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o diff --git a/patches.suse/unlock_page-speedup.patch b/patches.suse/unlock_page-speedup.patch index 5d5b3fbf54..af95c8aaec 100644 --- a/patches.suse/unlock_page-speedup.patch +++ b/patches.suse/unlock_page-speedup.patch @@ -102,7 +102,7 @@ To this: } --- a/kernel/wait.c +++ b/kernel/wait.c -@@ -176,8 +176,7 @@ int wake_bit_function(wait_queue_t *wait +@@ -177,8 +177,7 @@ int wake_bit_function(wait_queue_t *wait = container_of(wait, struct wait_bit_queue, wait); if (wait_bit->key.flags != key->flags || diff --git a/patches.suse/unmap_vmas-lat b/patches.suse/unmap_vmas-lat index 46bf431dd7..ad428721b9 100644 --- a/patches.suse/unmap_vmas-lat +++ b/patches.suse/unmap_vmas-lat @@ -14,7 +14,7 @@ latency improvements that have nothing to do with preempt. --- a/mm/memory.c +++ b/mm/memory.c -@@ -922,11 +922,11 @@ static unsigned long unmap_page_range(st +@@ -923,11 +923,11 @@ static unsigned long unmap_page_range(st return addr; } diff --git a/patches.suse/uvcvideo-ignore-hue-control-for-5986-0241.patch b/patches.suse/uvcvideo-ignore-hue-control-for-5986-0241.patch index bf8e822181..bcb52f1bea 100644 --- a/patches.suse/uvcvideo-ignore-hue-control-for-5986-0241.patch +++ b/patches.suse/uvcvideo-ignore-hue-control-for-5986-0241.patch @@ -30,7 +30,7 @@ Signed-off-by: Brandon Philips <bphilips@suse.de> return -EINVAL; --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c -@@ -1965,6 +1965,14 @@ static struct usb_device_id uvc_ids[] = +@@ -1983,6 +1983,14 @@ static struct usb_device_id uvc_ids[] = .bInterfaceProtocol = 0, .driver_info = UVC_QUIRK_PROBE_MINMAX | UVC_QUIRK_IGNORE_SELECTOR_UNIT }, diff --git a/patches.suse/xfs-dmapi-enable b/patches.suse/xfs-dmapi-enable index 29277f25e2..ca2158bc75 100644 --- a/patches.suse/xfs-dmapi-enable +++ b/patches.suse/xfs-dmapi-enable @@ -21,7 +21,7 @@ Acked-by: Jan Kara <jack@suse.cz> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -5621,6 +5621,13 @@ S: Supported +@@ -5636,6 +5636,13 @@ S: Supported F: Documentation/filesystems/xfs.txt F: fs/xfs/ @@ -102,7 +102,7 @@ Acked-by: Jan Kara <jack@suse.cz> --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -186,6 +186,9 @@ struct vm_operations_struct { +@@ -185,6 +185,9 @@ struct vm_operations_struct { void (*close)(struct vm_area_struct * area); int (*fault)(struct vm_area_struct *vma, struct vm_fault *vmf); diff --git a/patches.suse/xfs-nfsd-dmapi-aware b/patches.suse/xfs-nfsd-dmapi-aware index f202b19442..82529956fd 100644 --- a/patches.suse/xfs-nfsd-dmapi-aware +++ b/patches.suse/xfs-nfsd-dmapi-aware @@ -103,7 +103,7 @@ Acked-by: Jan Kara <jack@suse.cz> err = nfserrno(host_err); fh_unlock(fhp); } -@@ -918,6 +930,10 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st +@@ -917,6 +929,10 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st if (ra && ra->p_set) file->f_ra = ra->p_ra; @@ -114,7 +114,7 @@ Acked-by: Jan Kara <jack@suse.cz> if (file->f_op->splice_read && rqstp->rq_splice_ok) { struct splice_desc sd = { .len = 0, -@@ -950,8 +966,12 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st +@@ -949,8 +965,12 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st *count = host_err; err = 0; fsnotify_access(file->f_path.dentry); @@ -128,7 +128,7 @@ Acked-by: Jan Kara <jack@suse.cz> out: return err; } -@@ -1052,6 +1072,10 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s +@@ -1051,6 +1071,10 @@ nfsd_vfs_write(struct svc_rqst *rqstp, s spin_unlock(&file->f_lock); } @@ -139,7 +139,7 @@ Acked-by: Jan Kara <jack@suse.cz> /* Write the data. */ oldfs = get_fs(); set_fs(KERNEL_DS); host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &offset); -@@ -1073,8 +1097,12 @@ out_nfserr: +@@ -1072,8 +1096,12 @@ out_nfserr: dprintk("nfsd: write complete host_err=%d\n", host_err); if (host_err >= 0) err = 0; diff --git a/patches.trace/utrace-core b/patches.trace/utrace-core index 4c847ef723..59abb0e151 100644 --- a/patches.trace/utrace-core +++ b/patches.trace/utrace-core @@ -641,7 +641,7 @@ Signed-off-by: Petr Tesarik <ptesarik@suse.cz> fdt = files_fdtable(p->files); --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1325,6 +1325,11 @@ struct task_struct { +@@ -1335,6 +1335,11 @@ struct task_struct { #endif seccomp_t seccomp; @@ -1593,7 +1593,7 @@ Signed-off-by: Petr Tesarik <ptesarik@suse.cz> +#endif /* linux/utrace.h */ --- a/init/Kconfig +++ b/init/Kconfig -@@ -1207,6 +1207,16 @@ config STOP_MACHINE +@@ -1234,6 +1234,16 @@ config STOP_MACHINE help Need stop_machine() primitive. |