[gentoo-commits] linux-patches r1330 - genpatches-2.6/trunk/2.6.26

[Daniel Drake (dsd)]

Author: dsd
Date: 2008-07-17 03:22:36 +0000 (Thu, 17 Jul 2008)
New Revision: 1330

Removed:
   genpatches-2.6/trunk/2.6.26/4400_speakup-support.patch
Modified:
   genpatches-2.6/trunk/2.6.26/0000_README
   genpatches-2.6/trunk/2.6.26/4105_dm-bbr.patch
   genpatches-2.6/trunk/2.6.26/4405_alpha-sysctl-uac.patch
Log:
update patches for 2.6.26

Modified: genpatches-2.6/trunk/2.6.26/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.26/0000_README	2008-07-17 02:47:50 UTC (rev 1329)
+++ genpatches-2.6/trunk/2.6.26/0000_README	2008-07-17 03:22:36 UTC (rev 1330)
@@ -55,10 +55,6 @@
 From:	http://squashfs.sourceforge.net/
 Desc:	driver to support squashfs filesystems.
 
-Patch:	4400_speakup-support.patch
-From:	http://bugs.gentoo.org/215189
-Desc:	Add support for externally building speech synthesizer
-
 Patch:	4405_alpha-sysctl-uac.patch
 From:	Tavis Ormandy <taviso@g.o> and http://bugs.gentoo.org/show_bug.cgi?id=217323
 Desc:	enable control of the unaligned access control policy from sysctl

Modified: genpatches-2.6/trunk/2.6.26/4105_dm-bbr.patch
===================================================================
--- genpatches-2.6/trunk/2.6.26/4105_dm-bbr.patch	2008-07-17 02:47:50 UTC (rev 1329)
+++ genpatches-2.6/trunk/2.6.26/4105_dm-bbr.patch	2008-07-17 03:22:36 UTC (rev 1330)
@@ -1,10 +1,13 @@
 BBR Target, updated by dsd@g.o
 
 Incomplete changelog:
+ 2008/06/16: updated for new API in 2.6.26
  2007/07/08: updated for new API in 2.6.22
 
---- a/drivers/md/Kconfig
-+++ b/drivers/md/Kconfig
+Index: linux-2.6.26-gentoo/drivers/md/Kconfig
+===================================================================
+--- linux-2.6.26-gentoo.orig/drivers/md/Kconfig
++++ linux-2.6.26-gentoo/drivers/md/Kconfig
 @@ -288,4 +288,15 @@ config DM_UEVENT
  	---help---
  	Generate udev events for DM events.
@@ -21,18 +24,22 @@
 +	  If unsure, say N.
 +
  endif # MD
---- a/drivers/md/Makefile
-+++ b/drivers/md/Makefile
+Index: linux-2.6.26-gentoo/drivers/md/Makefile
+===================================================================
+--- linux-2.6.26-gentoo.orig/drivers/md/Makefile
++++ linux-2.6.26-gentoo/drivers/md/Makefile
 @@ -41,6 +41,7 @@ obj-$(CONFIG_DM_MULTIPATH_RDAC)	+= dm-rd
  obj-$(CONFIG_DM_SNAPSHOT)	+= dm-snapshot.o
- obj-$(CONFIG_DM_MIRROR)		+= dm-mirror.o
+ obj-$(CONFIG_DM_MIRROR)		+= dm-mirror.o dm-log.o
  obj-$(CONFIG_DM_ZERO)		+= dm-zero.o
 +obj-$(CONFIG_BLK_DEV_DM_BBR)	+= dm-bbr.o
  
  quiet_cmd_unroll = UNROLL  $@
        cmd_unroll = $(PERL) $(srctree)/$(src)/unroll.pl $(UNROLL) \
+Index: linux-2.6.26-gentoo/drivers/md/dm-bbr.c
+===================================================================
 --- /dev/null
-+++ b/drivers/md/dm-bbr.c
++++ linux-2.6.26-gentoo/drivers/md/dm-bbr.c
 @@ -0,0 +1,1012 @@
 +/*
 + *   (C) Copyright IBM Corp. 2002, 2004
@@ -69,12 +76,12 @@
 +#include <linux/mempool.h>
 +#include <linux/workqueue.h>
 +#include <linux/vmalloc.h>
++#include <linux/dm-io.h>
 +
 +#include "dm.h"
 +#include "dm-bio-list.h"
 +#include "dm-bio-record.h"
 +#include "dm-bbr.h"
-+#include "dm-io.h"
 +
 +#define DM_MSG_PREFIX "bbr"
 +#define SECTOR_SIZE (1 << SECTOR_SHIFT)
@@ -426,7 +433,7 @@
 +}
 +
 +static int rw_table(struct bbr_private *bbr_id, void *vma,
-+		    struct io_region *ptr, int rw)
++		    struct dm_io_region *ptr, int rw)
 +{
 +	bbr_id->vma_io_req.bi_rw = rw;
 +	bbr_id->vma_io_req.mem.ptr.vma = vma;
@@ -436,7 +443,7 @@
 +}
 +
 +static int io_sync(struct bbr_private *bbr_id, struct page_list *pl,
-+		   unsigned offset, struct io_region *ptr, int rw)
++		   unsigned offset, struct dm_io_region *ptr, int rw)
 +{
 +	bbr_id->page_io_req.bi_rw = rw;
 +	bbr_id->page_io_req.mem.ptr.pl = pl;
@@ -454,7 +461,7 @@
 +static int bbr_setup(struct bbr_private *bbr_id)
 +{
 +	struct bbr_table *table = bbr_id->bbr_table;
-+	struct io_region job;
++	struct dm_io_region job;
 +	int i, rc = 0;
 +
 +	job.bdev = bbr_id->dev->bdev;
@@ -507,7 +514,7 @@
 +			      unsigned int offset)
 +{
 +	struct bbr_table *bbr_table;
-+	struct io_region job;
++	struct dm_io_region job;
 +	struct page_list pl;
 +	unsigned long table_sector_index;
 +	unsigned long table_sector_offset;
@@ -620,7 +627,7 @@
 +static int bbr_io_process_request(struct bbr_private *bbr_id,
 +				  struct bio *bio)
 +{
-+	struct io_region job;
++	struct dm_io_region job;
 +	u64 starting_lsn = bio->bi_sector;
 +	u64 count, lsn, remapped_lsn;
 +	struct page_list pl;
@@ -1046,8 +1053,10 @@
 +module_init(dm_bbr_init);
 +module_exit(dm_bbr_exit);
 +MODULE_LICENSE("GPL");
+Index: linux-2.6.26-gentoo/drivers/md/dm-bbr.h
+===================================================================
 --- /dev/null
-+++ b/drivers/md/dm-bbr.h
++++ linux-2.6.26-gentoo/drivers/md/dm-bbr.h
 @@ -0,0 +1,130 @@
 +/*
 + *   (C) Copyright IBM Corp. 2002, 2004
@@ -1076,7 +1085,7 @@
 + * BBR replacement sectors have been used.
 + */
 +
-+#include "dm-io.h"
++#include <linux/dm-io.h>
 +
 +#define BBR_TABLE_SIGNATURE		0x42627254 /* BbrT */
 +#define BBR_ENTRIES_PER_SECT		31

Deleted: genpatches-2.6/trunk/2.6.26/4400_speakup-support.patch
===================================================================
--- genpatches-2.6/trunk/2.6.26/4400_speakup-support.patch	2008-07-17 02:47:50 UTC (rev 1329)
+++ genpatches-2.6/trunk/2.6.26/4400_speakup-support.patch	2008-07-17 03:22:36 UTC (rev 1330)
@@ -1,33 +0,0 @@
-diff --git a/drivers/char/consolemap.c b/drivers/char/consolemap.c
-index 4b3916f..37c7980 100644
---- a/drivers/char/consolemap.c
-+++ b/drivers/char/consolemap.c
-@@ -277,6 +277,7 @@
- 			return p->inverse_translations[m][glyph];
- 	}
- }
-+EXPORT_SYMBOL_GPL(inverse_translate);
- 
- static void update_user_maps(void)
- {
---- a/drivers/char/keyboard.c
-+++ b/drivers/char/keyboard.c
-@@ -111,6 +111,8 @@
-  
- struct kbd_struct kbd_table[MAX_NR_CONSOLES];
-+EXPORT_SYMBOL_GPL(kbd_table);
- static struct kbd_struct *kbd = kbd_table;
-+EXPORT_SYMBOL_GPL(kd_mksound);
- 
- struct vt_spawn_console vt_spawn_con = {
- 	.lock = __SPIN_LOCK_UNLOCKED(vt_spawn_con.lock),
---- a/drivers/char/vt.c
-+++ b/drivers/char/vt.c
-@@ -3934,6 +3934,7 @@
- 		c |= 0x100;
- 	return c;
- }
-+EXPORT_SYMBOL_GPL(screen_glyph);
- 
- /* used by vcs - note the word offset */
- unsigned short *screen_pos(struct vc_data *vc, int w_offset, int viewed)

Modified: genpatches-2.6/trunk/2.6.26/4405_alpha-sysctl-uac.patch
===================================================================
--- genpatches-2.6/trunk/2.6.26/4405_alpha-sysctl-uac.patch	2008-07-17 02:47:50 UTC (rev 1329)
+++ genpatches-2.6/trunk/2.6.26/4405_alpha-sysctl-uac.patch	2008-07-17 03:22:36 UTC (rev 1330)
@@ -1,9 +1,11 @@
---- src/arch/alpha/Kconfig.orig	2008-04-11 19:24:19.000000000 -0400
-+++ src/arch/alpha/Kconfig	2008-04-11 19:28:07.000000000 -0400
-@@ -616,6 +616,32 @@ config VERBOSE_MCHECK_ON
+Index: linux-2.6.26-gentoo/arch/alpha/Kconfig
+===================================================================
+--- linux-2.6.26-gentoo.orig/arch/alpha/Kconfig
++++ linux-2.6.26-gentoo/arch/alpha/Kconfig
+@@ -624,6 +624,32 @@ config HZ
+ 	default 1200 if ALPHA_RAWHIDE
+ 	default 1024
  
- 	  Take the default (1) unless you want more control or more info.
- 
 +config ALPHA_UAC_SYSCTL
 +	bool "Configure UAC policy via sysctl"
 +	depends on SYSCTL
@@ -33,9 +35,11 @@
  source "drivers/pci/Kconfig"
  source "drivers/eisa/Kconfig"
  
---- src/arch/alpha/kernel/traps.c.orig	2008-04-11 19:24:50.000000000 -0400
-+++ src/arch/alpha/kernel/traps.c	2008-04-13 17:07:10.000000000 -0400
-@@ -102,6 +102,52 @@ static char * ireg_name[] = {"v0", "t0",
+Index: linux-2.6.26-gentoo/arch/alpha/kernel/traps.c
+===================================================================
+--- linux-2.6.26-gentoo.orig/arch/alpha/kernel/traps.c
++++ linux-2.6.26-gentoo/arch/alpha/kernel/traps.c
+@@ -103,6 +103,52 @@ static char * ireg_name[] = {"v0", "t0",
  			   "t10", "t11", "ra", "pv", "at", "gp", "sp", "zero"};
  #endif
  
@@ -88,19 +92,19 @@
  static void
  dik_show_code(unsigned int *pc)
  {
-@@ -780,7 +826,11 @@ do_entUnaUser(void __user * va, unsigned
+@@ -782,7 +828,11 @@ do_entUnaUser(void __user * va, unsigned
  	/* Check the UAC bits to decide what the user wants us to do
  	   with the unaliged access.  */
  
 +#ifndef CONFIG_ALPHA_UAC_SYSCTL
  	if (!test_thread_flag (TIF_UAC_NOPRINT)) {
 +#else  /* CONFIG_ALPHA_UAC_SYSCTL */
-+   if (!(enabled_noprint)) {
++	if (!(enabled_noprint)) {
 +#endif /* CONFIG_ALPHA_UAC_SYSCTL */
- 		if (cnt >= 5 && jiffies - last_time > 5*HZ) {
+ 		if (cnt >= 5 && time_after(jiffies, last_time + 5 * HZ)) {
  			cnt = 0;
  		}
-@@ -791,10 +841,18 @@ do_entUnaUser(void __user * va, unsigned
+@@ -793,10 +843,18 @@ do_entUnaUser(void __user * va, unsigned
  		}
  		last_time = jiffies;
  	}
@@ -119,7 +123,7 @@
  		return;
  
  	/* Don't bother reading ds in the access check since we already
-@@ -1089,3 +1147,7 @@ trap_init(void)
+@@ -1091,3 +1149,7 @@ trap_init(void)
  	wrent(entSys, 5);
  	wrent(entDbg, 6);
  }
@@ -127,9 +131,11 @@
 +#ifdef CONFIG_ALPHA_UAC_SYSCTL
 +	__initcall(init_uac_sysctl);
 +#endif
---- src/kernel/sysctl.c.orig	2008-04-11 19:26:51.000000000 -0400
-+++ src/kernel/sysctl.c	2008-04-13 16:35:12.000000000 -0400
-@@ -168,6 +168,9 @@ extern struct ctl_table random_table[];
+Index: linux-2.6.26-gentoo/kernel/sysctl.c
+===================================================================
+--- linux-2.6.26-gentoo.orig/kernel/sysctl.c
++++ linux-2.6.26-gentoo/kernel/sysctl.c
+@@ -177,6 +177,9 @@ extern struct ctl_table random_table[];
  #ifdef CONFIG_INOTIFY_USER
  extern struct ctl_table inotify_table[];
  #endif
@@ -139,7 +145,7 @@
  
  #ifdef HAVE_ARCH_PICK_MMAP_LAYOUT
  int sysctl_legacy_va_layout;
-@@ -779,6 +782,14 @@ static struct ctl_table kern_table[] = {
+@@ -832,6 +835,14 @@ static struct ctl_table kern_table[] = {
   * NOTE: do not add new entries to this table unless you have read
   * Documentation/sysctl/ctl_unnumbered.txt
   */
@@ -154,4 +160,3 @@
  	{ .ctl_name = 0 }
  };
  
-

-- 
gentoo-commits@l.g.o mailing list