2.6.17-git13 refresh

5 files changed, 14 insertions, 13 deletions

diff --git a/pci/64bit-resource-change-resource-core-to-use-resource_size_t.patch b/pci/64bit-resource-change-resource-core-to-use-resource_size_t.patch
index 255b0f48148d8..ed2c51848e6fc 100644
--- a/pci/64bit-resource-change-resource-core-to-use-resource_size_t.patch
+++ b/pci/64bit-resource-change-resource-core-to-use-resource_size_t.patch
@@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	release_resource(res);
 --- gregkh-2.6.orig/include/linux/ioport.h
 +++ gregkh-2.6/include/linux/ioport.h
-@@ -98,31 +98,34 @@ extern struct resource * ____request_res
+@@ -98,14 +98,13 @@ extern struct resource * ____request_res
  extern int release_resource(struct resource *new);
  extern __deprecated_for_modules int insert_resource(struct resource *parent, struct resource *new);
  extern int allocate_resource(struct resource *root, struct resource *new,
@@ -55,8 +55,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 +int adjust_resource(struct resource *res, resource_size_t start,
 +		    resource_size_t size);
  
- /* Convenience shorthand with allocation */
- #define request_region(start,n,name)	__request_region(&ioport_resource, (start), (n), (name))
+ /* get registered SYSTEM_RAM resources in specified area */
+ extern int find_next_system_ram(struct resource *res);
+@@ -115,17 +114,21 @@ extern int find_next_system_ram(struct r
  #define request_mem_region(start,n,name) __request_region(&iomem_resource, (start), (n), (name))
  #define rename_region(region, newname) do { (region)->name = (newname); } while (0)
  
@@ -95,7 +96,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	struct resource *tmp, **p;
  
  	if (end < start)
-@@ -236,11 +236,10 @@ EXPORT_SYMBOL(release_resource);
+@@ -274,11 +274,10 @@ int find_next_system_ram(struct resource
   * Find empty slot in the resource tree given range and alignment.
   */
  static int find_resource(struct resource *root, struct resource *new,
@@ -110,7 +111,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			 void *alignf_data)
  {
  	struct resource *this = root->child;
-@@ -282,11 +281,10 @@ static int find_resource(struct resource
+@@ -320,11 +319,10 @@ static int find_resource(struct resource
   * Allocate empty slot in the resource tree given range and alignment.
   */
  int allocate_resource(struct resource *root, struct resource *new,
@@ -125,7 +126,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  		      void *alignf_data)
  {
  	int err;
-@@ -378,10 +376,10 @@ EXPORT_SYMBOL(insert_resource);
+@@ -416,10 +414,10 @@ EXPORT_SYMBOL(insert_resource);
   * arguments.  Returns -EBUSY if it can't fit.  Existing children of
   * the resource are assumed to be immutable.
   */
@@ -138,7 +139,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	int result = -EBUSY;
  
  	write_lock(&resource_lock);
-@@ -428,7 +426,9 @@ EXPORT_SYMBOL(adjust_resource);
+@@ -466,7 +464,9 @@ EXPORT_SYMBOL(adjust_resource);
   *
   * Release-region releases a matching busy region.
   */
@@ -149,7 +150,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  {
  	struct resource *res = kzalloc(sizeof(*res), GFP_KERNEL);
  
-@@ -464,7 +464,8 @@ struct resource * __request_region(struc
+@@ -502,7 +502,8 @@ struct resource * __request_region(struc
  
  EXPORT_SYMBOL(__request_region);
  
@@ -159,7 +160,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  {
  	struct resource * res;
  
-@@ -479,10 +480,11 @@ int __check_region(struct resource *pare
+@@ -517,10 +518,11 @@ int __check_region(struct resource *pare
  
  EXPORT_SYMBOL(__check_region);
  
diff --git a/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch b/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch
index 7f8f8cc033c06..8433d9aeb8c57 100644
--- a/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch
+++ b/pci/64bit-resource-finally-enable-64bit-resource-sizes.patch
@@ -75,7 +75,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  static DEFINE_RWLOCK(resource_lock);
 --- gregkh-2.6.orig/mm/Kconfig
 +++ gregkh-2.6/mm/Kconfig
-@@ -145,3 +145,9 @@ config MIGRATION
+@@ -146,3 +146,9 @@ config MIGRATION
  	  while the virtual addresses are not changed. This is useful for
  	  example on NUMA systems to put pages nearer to the processors accessing
  	  the page.
diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-arch-and-core-code.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-arch-and-core-code.patch
index 5d71c6a71fd0a..c9760699e88ba 100644
--- a/pci/64bit-resource-fix-up-printks-for-resources-in-arch-and-core-code.patch
+++ b/pci/64bit-resource-fix-up-printks-for-resources-in-arch-and-core-code.patch
@@ -387,7 +387,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  			r->name ? r->name : "<BAD>");
  	return 0;
  }
-@@ -511,7 +511,9 @@ void __release_region(struct resource *p
+@@ -549,7 +549,9 @@ void __release_region(struct resource *p
  
  	write_unlock(&resource_lock);
  
diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch
index f65d752264fb0..0a6ea5da78153 100644
--- a/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch
+++ b/pci/64bit-resource-fix-up-printks-for-resources-in-misc-drivers.patch
@@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	// check IO region
 --- gregkh-2.6.orig/drivers/atm/firestream.c
 +++ gregkh-2.6/drivers/atm/firestream.c
-@@ -1657,9 +1657,10 @@ static int __devinit fs_init (struct fs_
+@@ -1658,9 +1658,10 @@ static int __devinit fs_init (struct fs_
  	func_enter ();
  	pci_dev = dev->pci_dev;
  
diff --git a/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch b/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch
index a9e5897b0305e..67f1891b4a394 100644
--- a/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch
+++ b/pci/64bit-resource-fix-up-printks-for-resources-in-networks-drivers.patch
@@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/net/3c59x.c
 +++ gregkh-2.6/drivers/net/3c59x.c
-@@ -1408,8 +1408,10 @@ static int __devinit vortex_probe1(struc
+@@ -1407,8 +1407,10 @@ static int __devinit vortex_probe1(struc
  		}
  
  		if (print_info) {