rpms/kernel/devel drm-intel-no-tv-hotplug.patch, 1.1, 1.2 patch-2.6.32.3.bz2.sign, NONE, 1.1 .cvsignore, 1.1150, 1.1151 git-linus.diff, 1.21, 1.22 kernel.spec, 1.1883, 1.1884 sources, 1.1109, 1.1110 upstream, 1.1022, 1.1023 patch-2.6.32.2.bz2.sign, 1.1, NONE
Kyle McMartin
kyle at fedoraproject.org
Mon Jan 11 16:41:44 UTC 2010
Author: kyle
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16040
Modified Files:
.cvsignore git-linus.diff kernel.spec sources upstream
Added Files:
drm-intel-no-tv-hotplug.patch patch-2.6.32.3.bz2.sign
Removed Files:
patch-2.6.32.2.bz2.sign
Log Message:
* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.3-21
- Linux 2.6.32.3
- drm-intel-no-tv-hotplug.patch: re-add lost patch from F-12
2.6.31 (#522611, #544671)
drm-intel-no-tv-hotplug.patch:
i915_reg.h | 1 -
1 file changed, 1 deletion(-)
Index: drm-intel-no-tv-hotplug.patch
===================================================================
RCS file: drm-intel-no-tv-hotplug.patch
diff -N drm-intel-no-tv-hotplug.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ drm-intel-no-tv-hotplug.patch 11 Jan 2010 16:41:40 -0000 1.2
@@ -0,0 +1,11 @@
+diff -up linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h.jx linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h
+--- linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h.jx 2009-09-16 13:36:20.000000000 -0400
++++ linux-2.6.31.noarch/drivers/gpu/drm/i915/i915_reg.h 2009-09-16 13:40:32.000000000 -0400
+@@ -836,7 +836,6 @@
+ HDMID_HOTPLUG_INT_EN | \
+ SDVOB_HOTPLUG_INT_EN | \
+ SDVOC_HOTPLUG_INT_EN | \
+- TV_HOTPLUG_INT_EN | \
+ CRT_HOTPLUG_INT_EN)
+
+
--- NEW FILE patch-2.6.32.3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info
iD8DBQBLRSCkyGugalF9Dw4RAsjjAJ45QeV12uVH6buELeXJW9s3VRgmgACgk7Bw
odQ3e0znc7TAvGOzx2R6VIM=
=CKqn
-----END PGP SIGNATURE-----
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1150
retrieving revision 1.1151
diff -u -p -r1.1150 -r1.1151
--- .cvsignore 19 Dec 2009 02:35:33 -0000 1.1150
+++ .cvsignore 11 Jan 2010 16:41:40 -0000 1.1151
@@ -5,4 +5,4 @@ kernel-2.6.*.config
temp-*
kernel-2.6.32
linux-2.6.32.tar.bz2
-patch-2.6.32.2.bz2
+patch-2.6.32.3.bz2
git-linus.diff:
0 files changed
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.21 -r 1.22 git-linus.diffIndex: git-linus.diff
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/git-linus.diff,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- git-linus.diff 5 Jan 2010 11:21:12 -0000 1.21
+++ git-linus.diff 11 Jan 2010 16:41:40 -0000 1.22
@@ -1,4601 +1 @@
---- vanilla-2.6.32.2.orig/drivers/scsi/ipr.c
-+++ vanilla-2.6.32.2/drivers/scsi/ipr.c
-@@ -6516,6 +6516,7 @@ static int ipr_reset_restore_cfg_space(s
- int rc;
-
- ENTER;
-+ ioa_cfg->pdev->state_saved = true;
- rc = pci_restore_state(ioa_cfg->pdev);
-
- if (rc != PCIBIOS_SUCCESSFUL) {
---- vanilla-2.6.32.2.orig/drivers/scsi/qla2xxx/qla_os.c
-+++ vanilla-2.6.32.2/drivers/scsi/qla2xxx/qla_os.c
-@@ -2016,13 +2016,13 @@ skip_dpc:
- DEBUG2(printk("DEBUG: detect hba %ld at address = %p\n",
- base_vha->host_no, ha));
-
-- base_vha->flags.init_done = 1;
-- base_vha->flags.online = 1;
--
- ret = scsi_add_host(host, &pdev->dev);
- if (ret)
- goto probe_failed;
-
-+ base_vha->flags.init_done = 1;
-+ base_vha->flags.online = 1;
-+
- ha->isp_ops->enable_intrs(ha);
-
- scsi_scan_host(host);
---- vanilla-2.6.32.2.orig/drivers/scsi/st.c
-+++ vanilla-2.6.32.2/drivers/scsi/st.c
-@@ -552,13 +552,15 @@ st_do_scsi(struct st_request * SRpnt, st
- SRpnt->waiting = waiting;
-
- if (STp->buffer->do_dio) {
-+ mdata->page_order = 0;
- mdata->nr_entries = STp->buffer->sg_segs;
- mdata->pages = STp->buffer->mapped_pages;
- } else {
-+ mdata->page_order = STp->buffer->reserved_page_order;
- mdata->nr_entries =
- DIV_ROUND_UP(bytes, PAGE_SIZE << mdata->page_order);
-- STp->buffer->map_data.pages = STp->buffer->reserved_pages;
-- STp->buffer->map_data.offset = 0;
-+ mdata->pages = STp->buffer->reserved_pages;
-+ mdata->offset = 0;
- }
-
- memcpy(SRpnt->cmd, cmd, sizeof(SRpnt->cmd));
-@@ -3718,7 +3720,7 @@ static int enlarge_buffer(struct st_buff
- priority |= __GFP_ZERO;
-
- if (STbuffer->frp_segs) {
-- order = STbuffer->map_data.page_order;
-+ order = STbuffer->reserved_page_order;
- b_size = PAGE_SIZE << order;
- } else {
- for (b_size = PAGE_SIZE, order = 0;
-@@ -3751,7 +3753,7 @@ static int enlarge_buffer(struct st_buff
- segs++;
- }
- STbuffer->b_data = page_address(STbuffer->reserved_pages[0]);
-- STbuffer->map_data.page_order = order;
-+ STbuffer->reserved_page_order = order;
-
- return 1;
- }
-@@ -3764,7 +3766,7 @@ static void clear_buffer(struct st_buffe
-
- for (i=0; i < st_bp->frp_segs; i++)
- memset(page_address(st_bp->reserved_pages[i]), 0,
-- PAGE_SIZE << st_bp->map_data.page_order);
-+ PAGE_SIZE << st_bp->reserved_page_order);
- st_bp->cleared = 1;
- }
-
-@@ -3772,7 +3774,7 @@ static void clear_buffer(struct st_buffe
- /* Release the extra buffer */
- static void normalize_buffer(struct st_buffer * STbuffer)
- {
-- int i, order = STbuffer->map_data.page_order;
-+ int i, order = STbuffer->reserved_page_order;
-
- for (i = 0; i < STbuffer->frp_segs; i++) {
- __free_pages(STbuffer->reserved_pages[i], order);
-@@ -3780,7 +3782,7 @@ static void normalize_buffer(struct st_b
- }
- STbuffer->frp_segs = 0;
- STbuffer->sg_segs = 0;
-- STbuffer->map_data.page_order = 0;
-+ STbuffer->reserved_page_order = 0;
- STbuffer->map_data.offset = 0;
- }
-
-@@ -3790,7 +3792,7 @@ static void normalize_buffer(struct st_b
- static int append_to_buffer(const char __user *ubp, struct st_buffer * st_bp, int do_count)
- {
- int i, cnt, res, offset;
-- int length = PAGE_SIZE << st_bp->map_data.page_order;
-+ int length = PAGE_SIZE << st_bp->reserved_page_order;
-
- for (i = 0, offset = st_bp->buffer_bytes;
- i < st_bp->frp_segs && offset >= length; i++)
-@@ -3822,7 +3824,7 @@ static int append_to_buffer(const char _
- static int from_buffer(struct st_buffer * st_bp, char __user *ubp, int do_count)
- {
- int i, cnt, res, offset;
-- int length = PAGE_SIZE << st_bp->map_data.page_order;
-+ int length = PAGE_SIZE << st_bp->reserved_page_order;
-
- for (i = 0, offset = st_bp->read_pointer;
- i < st_bp->frp_segs && offset >= length; i++)
-@@ -3855,7 +3857,7 @@ static void move_buffer_data(struct st_b
- {
- int src_seg, dst_seg, src_offset = 0, dst_offset;
- int count, total;
-- int length = PAGE_SIZE << st_bp->map_data.page_order;
-+ int length = PAGE_SIZE << st_bp->reserved_page_order;
-
- if (offset == 0)
- return;
-@@ -4577,7 +4579,6 @@ static int sgl_map_user_pages(struct st_
- }
-
- mdata->offset = uaddr & ~PAGE_MASK;
-- mdata->page_order = 0;
- STbp->mapped_pages = pages;
-
- return nr_pages;
---- vanilla-2.6.32.2.orig/drivers/scsi/st.h
-+++ vanilla-2.6.32.2/drivers/scsi/st.h
-@@ -46,6 +46,7 @@ struct st_buffer {
- struct st_request *last_SRpnt;
- struct st_cmdstatus cmdstat;
- struct page **reserved_pages;
-+ int reserved_page_order;
- struct page **mapped_pages;
- struct rq_map_data map_data;
- unsigned char *b_data;
---- vanilla-2.6.32.2.orig/drivers/scsi/scsi_transport_fc.c
-+++ vanilla-2.6.32.2/drivers/scsi/scsi_transport_fc.c
-@@ -648,11 +648,22 @@ static __init int fc_transport_init(void
- return error;
- error = transport_class_register(&fc_vport_class);
- if (error)
-- return error;
-+ goto unreg_host_class;
- error = transport_class_register(&fc_rport_class);
- if (error)
-- return error;
-- return transport_class_register(&fc_transport_class);
-+ goto unreg_vport_class;
-+ error = transport_class_register(&fc_transport_class);
-+ if (error)
-+ goto unreg_rport_class;
-+ return 0;
-+
-+unreg_rport_class:
-+ transport_class_unregister(&fc_rport_class);
-+unreg_vport_class:
-+ transport_class_unregister(&fc_vport_class);
-+unreg_host_class:
-+ transport_class_unregister(&fc_host_class);
-+ return error;
- }
-
- static void __exit fc_transport_exit(void)
---- vanilla-2.6.32.2.orig/kernel/sched.c
-+++ vanilla-2.6.32.2/kernel/sched.c
-@@ -2036,6 +2036,9 @@ task_hot(struct task_struct *p, u64 now,
- {
- s64 delta;
-
-+ if (p->sched_class != &fair_sched_class)
-+ return 0;
-+
- /*
- * Buddy candidates are cache hot:
- */
-@@ -2044,9 +2047,6 @@ task_hot(struct task_struct *p, u64 now,
- &p->se == cfs_rq_of(&p->se)->last))
- return 1;
-
-- if (p->sched_class != &fair_sched_class)
-- return 0;
--
- if (sysctl_sched_migration_cost == -1)
- return 1;
- if (sysctl_sched_migration_cost == 0)
-@@ -4139,7 +4139,7 @@ static int load_balance(int this_cpu, st
- unsigned long flags;
[...4211 lines suppressed...]
-+static void __rwmsr_on_cpus(const struct cpumask *mask, u32 msr_no,
-+ struct msr *msrs,
-+ void (*msr_func) (void *info))
-+{
-+ struct msr_info rv;
-+ int this_cpu;
-+
-+ memset(&rv, 0, sizeof(rv));
-+
-+ rv.msrs = msrs;
-+ rv.msr_no = msr_no;
-+
-+ this_cpu = get_cpu();
-+
-+ if (cpumask_test_cpu(this_cpu, mask))
-+ msr_func(&rv);
-+
-+ smp_call_function_many(mask, msr_func, &rv, 1);
-+ put_cpu();
-+}
-+
-+/* rdmsr on a bunch of CPUs
-+ *
-+ * @mask: which CPUs
-+ * @msr_no: which MSR
-+ * @msrs: array of MSR values
-+ *
-+ */
-+void rdmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs)
-+{
-+ __rwmsr_on_cpus(mask, msr_no, msrs, __rdmsr_on_cpu);
-+}
-+EXPORT_SYMBOL(rdmsr_on_cpus);
-+
-+/*
-+ * wrmsr on a bunch of CPUs
-+ *
-+ * @mask: which CPUs
-+ * @msr_no: which MSR
-+ * @msrs: array of MSR values
-+ *
-+ */
-+void wrmsr_on_cpus(const struct cpumask *mask, u32 msr_no, struct msr *msrs)
-+{
-+ __rwmsr_on_cpus(mask, msr_no, msrs, __wrmsr_on_cpu);
-+}
-+EXPORT_SYMBOL(wrmsr_on_cpus);
-+
-+/* These "safe" variants are slower and should be used when the target MSR
-+ may not actually exist. */
-+static void __rdmsr_safe_on_cpu(void *info)
-+{
-+ struct msr_info *rv = info;
-+
-+ rv->err = rdmsr_safe(rv->msr_no, &rv->reg.l, &rv->reg.h);
-+}
-+
-+static void __wrmsr_safe_on_cpu(void *info)
-+{
-+ struct msr_info *rv = info;
-+
-+ rv->err = wrmsr_safe(rv->msr_no, rv->reg.l, rv->reg.h);
-+}
-+
-+int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)
-+{
-+ int err;
-+ struct msr_info rv;
-+
-+ memset(&rv, 0, sizeof(rv));
-+
-+ rv.msr_no = msr_no;
-+ err = smp_call_function_single(cpu, __rdmsr_safe_on_cpu, &rv, 1);
-+ *l = rv.reg.l;
-+ *h = rv.reg.h;
-+
-+ return err ? err : rv.err;
-+}
-+EXPORT_SYMBOL(rdmsr_safe_on_cpu);
-+
-+int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)
-+{
-+ int err;
-+ struct msr_info rv;
-+
-+ memset(&rv, 0, sizeof(rv));
-+
-+ rv.msr_no = msr_no;
-+ rv.reg.l = l;
-+ rv.reg.h = h;
-+ err = smp_call_function_single(cpu, __wrmsr_safe_on_cpu, &rv, 1);
-+
-+ return err ? err : rv.err;
-+}
-+EXPORT_SYMBOL(wrmsr_safe_on_cpu);
-+
-+/*
-+ * These variants are significantly slower, but allows control over
-+ * the entire 32-bit GPR set.
-+ */
-+static void __rdmsr_safe_regs_on_cpu(void *info)
-+{
-+ struct msr_regs_info *rv = info;
-+
-+ rv->err = rdmsr_safe_regs(rv->regs);
-+}
-+
-+static void __wrmsr_safe_regs_on_cpu(void *info)
-+{
-+ struct msr_regs_info *rv = info;
-+
-+ rv->err = wrmsr_safe_regs(rv->regs);
-+}
-+
-+int rdmsr_safe_regs_on_cpu(unsigned int cpu, u32 *regs)
-+{
-+ int err;
-+ struct msr_regs_info rv;
-+
-+ rv.regs = regs;
-+ rv.err = -EIO;
-+ err = smp_call_function_single(cpu, __rdmsr_safe_regs_on_cpu, &rv, 1);
-+
-+ return err ? err : rv.err;
-+}
-+EXPORT_SYMBOL(rdmsr_safe_regs_on_cpu);
-+
-+int wrmsr_safe_regs_on_cpu(unsigned int cpu, u32 *regs)
-+{
-+ int err;
-+ struct msr_regs_info rv;
-+
-+ rv.regs = regs;
-+ rv.err = -EIO;
-+ err = smp_call_function_single(cpu, __wrmsr_safe_regs_on_cpu, &rv, 1);
-+
-+ return err ? err : rv.err;
-+}
-+EXPORT_SYMBOL(wrmsr_safe_regs_on_cpu);
---- vanilla-2.6.32.2.orig/Documentation/filesystems/ext4.txt
-+++ vanilla-2.6.32.2/Documentation/filesystems/ext4.txt
-@@ -196,7 +196,7 @@ nobarrier This also requires an IO stac
- also be used to enable or disable barriers, for
- consistency with other ext4 mount options.
-
--inode_readahead=n This tuning parameter controls the maximum
-+inode_readahead_blks=n This tuning parameter controls the maximum
- number of inode table blocks that ext4's inode
- table readahead algorithm will pre-read into
- the buffer cache. The default value is 32 blocks.
---- vanilla-2.6.32.2.orig/drivers/lguest/segments.c
-+++ vanilla-2.6.32.2/drivers/lguest/segments.c
-@@ -179,8 +179,10 @@ void load_guest_gdt_entry(struct lg_cpu
- * We assume the Guest has the same number of GDT entries as the
- * Host, otherwise we'd have to dynamically allocate the Guest GDT.
- */
-- if (num >= ARRAY_SIZE(cpu->arch.gdt))
-+ if (num >= ARRAY_SIZE(cpu->arch.gdt)) {
- kill_guest(cpu, "too many gdt entries %i", num);
-+ return;
-+ }
-
- /* Set it up, then fix it. */
- cpu->arch.gdt[num].a = lo;
---- vanilla-2.6.32.2.orig/mm/vmscan.c
-+++ vanilla-2.6.32.2/mm/vmscan.c
-@@ -1464,20 +1464,26 @@ static int inactive_file_is_low(struct z
- return low;
- }
-
-+static int inactive_list_is_low(struct zone *zone, struct scan_control *sc,
-+ int file)
-+{
-+ if (file)
-+ return inactive_file_is_low(zone, sc);
-+ else
-+ return inactive_anon_is_low(zone, sc);
-+}
-+
- static unsigned long shrink_list(enum lru_list lru, unsigned long nr_to_scan,
- struct zone *zone, struct scan_control *sc, int priority)
- {
- int file = is_file_lru(lru);
-
-- if (lru == LRU_ACTIVE_FILE && inactive_file_is_low(zone, sc)) {
-- shrink_active_list(nr_to_scan, zone, sc, priority, file);
-+ if (is_active_lru(lru)) {
-+ if (inactive_list_is_low(zone, sc, file))
-+ shrink_active_list(nr_to_scan, zone, sc, priority, file);
- return 0;
- }
-
-- if (lru == LRU_ACTIVE_ANON && inactive_anon_is_low(zone, sc)) {
-- shrink_active_list(nr_to_scan, zone, sc, priority, file);
-- return 0;
-- }
- return shrink_inactive_list(nr_to_scan, zone, sc, priority, file);
- }
-
+nil
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1883
retrieving revision 1.1884
diff -u -p -r1.1883 -r1.1884
--- kernel.spec 11 Jan 2010 16:19:58 -0000 1.1883
+++ kernel.spec 11 Jan 2010 16:41:43 -0000 1.1884
@@ -40,7 +40,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 3
# Is it a -stable RC?
%define stable_rc 0
# Set rpm version accordingly
@@ -1995,6 +1995,11 @@ fi
# and build.
%changelog
+* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.3-21
+- Linux 2.6.32.3
+- drm-intel-no-tv-hotplug.patch: re-add lost patch from F-12
+ 2.6.31 (#522611, #544671)
+
* Mon Jan 11 2010 Kyle McMartin <kyle at redhat.com> 2.6.32.2-20
- Re-enable ATM_HE (#545289)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.1109
retrieving revision 1.1110
diff -u -p -r1.1109 -r1.1110
--- sources 19 Dec 2009 02:35:34 -0000 1.1109
+++ sources 11 Jan 2010 16:41:43 -0000 1.1110
@@ -1,2 +1,2 @@
260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
-924b7aa0fcd6e54c12ecc9b3c3082f59 patch-2.6.32.2.bz2
+6bd3c5fea1e88bb4d0948ec3688bd8f6 patch-2.6.32.3.bz2
Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.1022
retrieving revision 1.1023
diff -u -p -r1.1022 -r1.1023
--- upstream 19 Dec 2009 02:35:34 -0000 1.1022
+++ upstream 11 Jan 2010 16:41:43 -0000 1.1023
@@ -1,2 +1,2 @@
linux-2.6.32.tar.bz2
-patch-2.6.32.2.bz2
+patch-2.6.32.3.bz2
--- patch-2.6.32.2.bz2.sign DELETED ---
More information about the scm-commits
mailing list