[kernel] r15561 - in dists/sid/linux-2.6/debian/patches: bugfix/all/stable series

Maximilian Attems maks at alioth.debian.org
Tue Apr 27 05:49:31 UTC 2010


Author: maks
Date: Tue Apr 27 05:49:07 2010
New Revision: 15561

Log:
add the released stable patches

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.12.patch
      - copied, changed from r15555, dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.12-rc1.patch
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.33.3.patch
      - copied, changed from r15555, dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.3-rc1.patch
Deleted:
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.12-rc1.patch
   dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.3-rc1.patch
Modified:
   dists/sid/linux-2.6/debian/patches/series/12

Copied and modified: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.12.patch (from r15555, dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.12-rc1.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.12-rc1.patch	Sun Apr 25 22:58:27 2010	(r15555, copy source)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.12.patch	Tue Apr 27 05:49:07 2010	(r15561)
@@ -151,89 +151,6 @@
  		memset(memslot->dirty_bitmap, 0, n);
  	}
  	r = 0;
-diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
-index 5adba4f..266c003 100644
---- a/arch/mips/mm/tlbex.c
-+++ b/arch/mips/mm/tlbex.c
-@@ -725,10 +725,15 @@ static void __cpuinit build_r4000_tlb_refill_handler(void)
- 	 * create the plain linear handler
- 	 */
- 	if (bcm1250_m3_war()) {
--		UASM_i_MFC0(&p, K0, C0_BADVADDR);
--		UASM_i_MFC0(&p, K1, C0_ENTRYHI);
-+		unsigned int segbits = 44;
-+
-+		uasm_i_dmfc0(&p, K0, C0_BADVADDR);
-+		uasm_i_dmfc0(&p, K1, C0_ENTRYHI);
- 		uasm_i_xor(&p, K0, K0, K1);
--		UASM_i_SRL(&p, K0, K0, PAGE_SHIFT + 1);
-+		uasm_i_dsrl32(&p, K1, K0, 62 - 32);
-+		uasm_i_dsrl(&p, K0, K0, 12 + 1);
-+		uasm_i_dsll32(&p, K0, K0, 64 + 12 + 1 - segbits - 32);
-+		uasm_i_or(&p, K0, K0, K1);
- 		uasm_il_bnez(&p, &r, K0, label_leave);
- 		/* No need for uasm_i_nop */
- 	}
-@@ -1242,10 +1247,15 @@ static void __cpuinit build_r4000_tlb_load_handler(void)
- 	memset(relocs, 0, sizeof(relocs));
- 
- 	if (bcm1250_m3_war()) {
--		UASM_i_MFC0(&p, K0, C0_BADVADDR);
--		UASM_i_MFC0(&p, K1, C0_ENTRYHI);
-+		unsigned int segbits = 44;
-+
-+		uasm_i_dmfc0(&p, K0, C0_BADVADDR);
-+		uasm_i_dmfc0(&p, K1, C0_ENTRYHI);
- 		uasm_i_xor(&p, K0, K0, K1);
--		UASM_i_SRL(&p, K0, K0, PAGE_SHIFT + 1);
-+		uasm_i_dsrl32(&p, K1, K0, 62 - 32);
-+		uasm_i_dsrl(&p, K0, K0, 12 + 1);
-+		uasm_i_dsll32(&p, K0, K0, 64 + 12 + 1 - segbits - 32);
-+		uasm_i_or(&p, K0, K0, K1);
- 		uasm_il_bnez(&p, &r, K0, label_leave);
- 		/* No need for uasm_i_nop */
- 	}
-diff --git a/arch/mips/mm/uasm.c b/arch/mips/mm/uasm.c
-index f467199..e1bd527 100644
---- a/arch/mips/mm/uasm.c
-+++ b/arch/mips/mm/uasm.c
-@@ -62,7 +62,7 @@ enum opcode {
- 	insn_dmtc0, insn_dsll, insn_dsll32, insn_dsra, insn_dsrl,
- 	insn_dsrl32, insn_dsubu, insn_eret, insn_j, insn_jal, insn_jr,
- 	insn_ld, insn_ll, insn_lld, insn_lui, insn_lw, insn_mfc0,
--	insn_mtc0, insn_ori, insn_pref, insn_rfe, insn_sc, insn_scd,
-+	insn_mtc0, insn_or, insn_ori, insn_pref, insn_rfe, insn_sc, insn_scd,
- 	insn_sd, insn_sll, insn_sra, insn_srl, insn_subu, insn_sw,
- 	insn_tlbp, insn_tlbwi, insn_tlbwr, insn_xor, insn_xori
- };
-@@ -116,6 +116,7 @@ static struct insn insn_table[] __cpuinitdata = {
- 	{ insn_lw,  M(lw_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
- 	{ insn_mfc0,  M(cop0_op, mfc_op, 0, 0, 0, 0),  RT | RD | SET},
- 	{ insn_mtc0,  M(cop0_op, mtc_op, 0, 0, 0, 0),  RT | RD | SET},
-+	{ insn_or,  M(spec_op, 0, 0, 0, 0, or_op),  RS | RT | RD },
- 	{ insn_ori,  M(ori_op, 0, 0, 0, 0, 0),  RS | RT | UIMM },
- 	{ insn_pref,  M(pref_op, 0, 0, 0, 0, 0),  RS | RT | SIMM },
- 	{ insn_rfe,  M(cop0_op, cop_op, 0, 0, 0, rfe_op),  0 },
-@@ -362,6 +363,7 @@ I_u2s3u1(_lw)
- I_u1u2u3(_mfc0)
- I_u1u2u3(_mtc0)
- I_u2u1u3(_ori)
-+I_u3u1u2(_or)
- I_u2s3u1(_pref)
- I_0(_rfe)
- I_u2s3u1(_sc)
-diff --git a/arch/mips/mm/uasm.h b/arch/mips/mm/uasm.h
-index c6d1e3d..5198ae5 100644
---- a/arch/mips/mm/uasm.h
-+++ b/arch/mips/mm/uasm.h
-@@ -78,6 +78,7 @@ Ip_u2s3u1(_lw);
- Ip_u1u2u3(_mfc0);
- Ip_u1u2u3(_mtc0);
- Ip_u2u1u3(_ori);
-+Ip_u3u1u2(_or);
- Ip_u2s3u1(_pref);
- Ip_0(_rfe);
- Ip_u2s3u1(_sc);
 diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h
 index ccb1d93..bf6939c 100644
 --- a/arch/sh/include/asm/elf.h
@@ -3800,67 +3717,6 @@
  
  		disk->head_position = 0;
  	}
-diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
-index 431b9b2..ffcdd76 100644
---- a/drivers/md/raid5.c
-+++ b/drivers/md/raid5.c
-@@ -1649,8 +1649,8 @@ static sector_t raid5_compute_sector(raid5_conf_t *conf, sector_t r_sector,
- 				     int previous, int *dd_idx,
- 				     struct stripe_head *sh)
- {
--	long stripe;
--	unsigned long chunk_number;
-+	sector_t stripe;
-+	sector_t chunk_number;
- 	unsigned int chunk_offset;
- 	int pd_idx, qd_idx;
- 	int ddf_layout = 0;
-@@ -1670,17 +1670,12 @@ static sector_t raid5_compute_sector(raid5_conf_t *conf, sector_t r_sector,
- 	 */
- 	chunk_offset = sector_div(r_sector, sectors_per_chunk);
- 	chunk_number = r_sector;
--	BUG_ON(r_sector != chunk_number);
- 
- 	/*
- 	 * Compute the stripe number
- 	 */
--	stripe = chunk_number / data_disks;
--
--	/*
--	 * Compute the data disk and parity disk indexes inside the stripe
--	 */
--	*dd_idx = chunk_number % data_disks;
-+	stripe = chunk_number;
-+	*dd_idx = sector_div(stripe, data_disks);
- 
- 	/*
- 	 * Select the parity disk based on the user selected algorithm.
-@@ -1869,14 +1864,14 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i, int previous)
- 				 : conf->algorithm;
- 	sector_t stripe;
- 	int chunk_offset;
--	int chunk_number, dummy1, dd_idx = i;
-+	sector_t chunk_number;
-+	int dummy1, dd_idx = i;
- 	sector_t r_sector;
- 	struct stripe_head sh2;
- 
- 
- 	chunk_offset = sector_div(new_sector, sectors_per_chunk);
- 	stripe = new_sector;
--	BUG_ON(new_sector != stripe);
- 
- 	if (i == sh->pd_idx)
- 		return 0;
-@@ -1969,7 +1964,7 @@ static sector_t compute_blocknr(struct stripe_head *sh, int i, int previous)
- 	}
- 
- 	chunk_number = stripe * data_disks + i;
--	r_sector = (sector_t)chunk_number * sectors_per_chunk + chunk_offset;
-+	r_sector = chunk_number * sectors_per_chunk + chunk_offset;
- 
- 	check = raid5_compute_sector(conf, r_sector,
- 				     previous, &dummy1, &sh2);
 diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
 index 9b2e219..352acd0 100644
 --- a/drivers/message/fusion/mptctl.c
@@ -4033,7 +3889,7 @@
  	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 },
  	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES_QUAD), board_82575 },
 diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
-index 0fe2fc9..4f858e1 100644
+index 0fe2fc9..ab75323 100644
 --- a/drivers/net/r8169.c
 +++ b/drivers/net/r8169.c
 @@ -186,7 +186,12 @@ static struct pci_device_id rtl8169_pci_tbl[] = {
@@ -4061,8 +3917,8 @@
 +	unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
 +
 +	if (max_frame != 16383)
-+		printk(KERN_WARNING "WARNING! Changing of MTU on this NIC"
-+			"May lead to frame reception errors!\n");
++		printk(KERN_WARNING PFX "WARNING! Changing of MTU on this "
++			"NIC may lead to frame reception errors!\n");
  
  	tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE;
  }
@@ -8972,7 +8828,7 @@
  			desc->depth = 0;
  			desc->status &= ~IRQ_DISABLED;
 diff --git a/kernel/lockdep.c b/kernel/lockdep.c
-index 9af5672..9683d94 100644
+index 9af5672..f672d51 100644
 --- a/kernel/lockdep.c
 +++ b/kernel/lockdep.c
 @@ -591,9 +591,9 @@ static int static_obj(void *obj)
@@ -8983,8 +8839,8 @@
 -		end   = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM
 -					+ per_cpu_offset(i);
 +		start = (unsigned long) per_cpu_ptr(&__per_cpu_start, i);
-+		end   = (unsigned long) per_cpu_ptr(&__per_cpu_start
-+						    + PERCPU_ENOUGH_ROOM, i);
++		end   = (unsigned long) per_cpu_ptr(&__per_cpu_start, i)
++					+ PERCPU_ENOUGH_ROOM;
  
  		if ((addr >= start) && (addr < end))
  			return 1;

Copied and modified: dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.33.3.patch (from r15555, dists/sid/linux-2.6/debian/patches/bugfix/all/stable/2.6.32.3-rc1.patch)
==============================================================================

Modified: dists/sid/linux-2.6/debian/patches/series/12
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/12	Tue Apr 27 05:40:01 2010	(r15560)
+++ dists/sid/linux-2.6/debian/patches/series/12	Tue Apr 27 05:49:07 2010	(r15561)
@@ -22,8 +22,8 @@
 - bugfix/x86/eeepc-laptop-add-hotplug_disable-parameter.patch
 - bugfix/x86/eeepc-laptop-dmi-blacklist-to-disable-pci-hotplug.patch
 - bugfix/x86/eeepc-laptop-disable-cpu-speed-control-on-EeePC-701.patch
-+ bugfix/all/stable/2.6.32.12-rc1.patch
-+ bugfix/all/stable/2.6.32.3-rc1.patch
++ bugfix/all/stable/2.6.32.12.patch
++ bugfix/all/stable/2.6.33.3.patch
 + features/all/ipheth-add.patch
 + bugfix/all/libata-fix-accesses-at-LBA28-boundary.patch
 + bugfix/all/thinkpad-acpi-add-x100e.patch



More information about the Kernel-svn-changes mailing list