- kconfigurable-resources-arch-dependent-changes-arch-j-p.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     kconfigurable resources: arch dependent changes (arch/[j-p]*)

has been removed from the -mm tree.  Its filename is

     kconfigurable-resources-arch-dependent-changes-arch-j-p.patch

This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.

------------------------------------------------------
Subject: kconfigurable resources: arch dependent changes (arch/[j-p]*)
From: Vivek Goyal <vgoyal@xxxxxxxxxx>


o Changes to arch specific code for  kconfigurable resources. This
  patch contains changes for arch/[j-p]*

Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 arch/m32r/Kconfig                  |    7 +++++++
 arch/m68k/Kconfig                  |    7 +++++++
 arch/m68knommu/Kconfig             |    7 +++++++
 arch/m68knommu/kernel/comempci.c   |    3 ++-
 arch/mips/Kconfig                  |    8 ++++++++
 arch/mips/pci/pci.c                |    4 ++--
 arch/mips/pmc-sierra/yosemite/ht.c |    4 ++--
 arch/parisc/Kconfig                |    8 ++++++++
 arch/parisc/kernel/pci.c           |    2 +-
 arch/powerpc/Kconfig               |    8 ++++++++
 arch/powerpc/kernel/pci_32.c       |   10 +++++-----
 arch/powerpc/kernel/pci_64.c       |    4 ++--
 arch/ppc/Kconfig                   |    7 +++++++
 arch/ppc/kernel/pci.c              |   12 ++++++------
 include/asm-powerpc/pci.h          |    2 +-
 include/asm-ppc/pci.h              |    2 +-
 16 files changed, 74 insertions(+), 21 deletions(-)

diff -puN arch/m32r/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/m32r/Kconfig
--- devel/arch/m32r/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/m32r/Kconfig	2006-05-11 15:18:14.000000000 -0700
@@ -188,6 +188,13 @@ config ARCH_DISCONTIGMEM_ENABLE
 
 source "mm/Kconfig"
 
+config RESOURCES_32BIT
+	bool "32 bit Memory and IO resources (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
+	help
+	  By default resources are 64 bit. This option allows memory and IO
+	  resources to be 32 bit to optimize code size.
+
 config IRAM_START
 	hex "Internal memory start address (hex)"
 	default "00f00000" if !CHIP_M32104
diff -puN arch/m68k/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/m68k/Kconfig
--- devel/arch/m68k/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/m68k/Kconfig	2006-05-11 15:18:14.000000000 -0700
@@ -368,6 +368,13 @@ config 060_WRITETHROUGH
 
 source "mm/Kconfig"
 
+config RESOURCES_32BIT
+	bool "32 bit Memory and IO resources (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
+	help
+	  By default resources are 64 bit. This option allows memory and IO
+	  resources to be 32 bit to optimize code size.
+
 endmenu
 
 menu "General setup"
diff -puN arch/m68knommu/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/m68knommu/Kconfig
--- devel/arch/m68knommu/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/m68knommu/Kconfig	2006-05-11 15:18:14.000000000 -0700
@@ -605,6 +605,13 @@ endchoice
 
 source "mm/Kconfig"
 
+config RESOURCES_32BIT
+	bool "32 bit Memory and IO resources (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
+	help
+	  By default resources are 64 bit. This option allows memory and IO
+	  resources to be 32 bit to optimize code size.
+
 endmenu
 
 config ISA_DMA_API
diff -puN arch/m68knommu/kernel/comempci.c~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/m68knommu/kernel/comempci.c
--- devel/arch/m68knommu/kernel/comempci.c~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/m68knommu/kernel/comempci.c	2006-05-11 15:18:14.000000000 -0700
@@ -357,7 +357,8 @@ void pcibios_fixup_bus(struct pci_bus *b
 
 /*****************************************************************************/
 
-void pcibios_align_resource(void *data, struct resource *res, unsigned long size, unsigned long align)
+void pcibios_align_resource(void *data, struct resource *res,
+				resource_size_t size, resource_size_t align)
 {
 }
 
diff -puN arch/mips/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/mips/Kconfig
--- devel/arch/mips/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/mips/Kconfig	2006-05-11 15:18:14.000000000 -0700
@@ -1676,6 +1676,14 @@ config NR_CPUS
 
 source "kernel/Kconfig.preempt"
 
+config RESOURCES_32BIT
+	bool "32 bit Memory and IO resources (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
+	depends on 32BIT
+	help
+	  By default resources are 64 bit. This option allows memory and IO
+	  resources to be 32 bit to optimize code size.
+
 config RTC_DS1742
 	bool "DS1742 BRAM/RTC support"
 	depends on TOSHIBA_JMR3927 || TOSHIBA_RBTX4927
diff -puN arch/mips/pci/pci.c~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/mips/pci/pci.c
--- devel/arch/mips/pci/pci.c~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/mips/pci/pci.c	2006-05-11 15:18:14.000000000 -0700
@@ -51,11 +51,11 @@ unsigned long PCIBIOS_MIN_MEM	= 0;
  */
 void
 pcibios_align_resource(void *data, struct resource *res,
-		       unsigned long size, unsigned long align)
+		       resource_size_t size, resource_size_t align)
 {
 	struct pci_dev *dev = data;
 	struct pci_controller *hose = dev->sysdata;
-	unsigned long start = res->start;
+	resource_size_t start = res->start;
 
 	if (res->flags & IORESOURCE_IO) {
 		/* Make sure we start at our min on all hoses */
diff -puN arch/mips/pmc-sierra/yosemite/ht.c~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/mips/pmc-sierra/yosemite/ht.c
--- devel/arch/mips/pmc-sierra/yosemite/ht.c~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/mips/pmc-sierra/yosemite/ht.c	2006-05-11 15:18:14.000000000 -0700
@@ -383,12 +383,12 @@ void pcibios_update_resource(struct pci_
 
 
 void pcibios_align_resource(void *data, struct resource *res,
-                            unsigned long size, unsigned long align)
+                            resource_size_t size, resource_size_t align)
 {
         struct pci_dev *dev = data;
 
         if (res->flags & IORESOURCE_IO) {
-                unsigned long start = res->start;
+                resource_size_t start = res->start;
 
                 /* We need to avoid collisions with `mirrored' VGA ports
                    and other strange ISA hardware, so we always want the
diff -puN arch/parisc/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/parisc/Kconfig
--- devel/arch/parisc/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/parisc/Kconfig	2006-05-11 15:18:14.000000000 -0700
@@ -217,6 +217,14 @@ source "kernel/Kconfig.preempt"
 source "kernel/Kconfig.hz"
 source "mm/Kconfig"
 
+config RESOURCES_32BIT
+	bool "32 bit Memory and IO resources (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
+	depends on !64BIT
+	help
+	  By default resources are 64 bit. This option allows memory and IO
+	  resources to be 32 bit to optimize code size.
+
 config COMPAT
 	def_bool y
 	depends on 64BIT
diff -puN arch/parisc/kernel/pci.c~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/parisc/kernel/pci.c
--- devel/arch/parisc/kernel/pci.c~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/parisc/kernel/pci.c	2006-05-11 15:18:14.000000000 -0700
@@ -289,7 +289,7 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
  * than res->start.
  */
 void pcibios_align_resource(void *data, struct resource *res,
-				unsigned long size, unsigned long alignment)
+				resource_size_t size, resource_size_t alignment)
 {
 	unsigned long mask, align;
 
diff -puN arch/powerpc/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/powerpc/Kconfig
--- devel/arch/powerpc/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/powerpc/Kconfig	2006-05-11 15:18:14.000000000 -0700
@@ -626,6 +626,14 @@ config CRASH_DUMP
 
 	  Don't change this unless you know what you are doing.
 
+config RESOURCES_32BIT
+        bool "32 bit Memory and IO resources (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+	depends on PPC32
+        help
+          By default resources are 64 bit. This option allows memory and IO
+          resources to be 32 bit to optimize code size.
+
 config EMBEDDEDBOOT
 	bool
 	depends on 8xx || 8260
diff -puN arch/powerpc/kernel/pci_32.c~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/powerpc/kernel/pci_32.c
--- devel/arch/powerpc/kernel/pci_32.c~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/powerpc/kernel/pci_32.c	2006-05-11 15:18:14.000000000 -0700
@@ -173,18 +173,18 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
  * but we want to try to avoid allocating at 0x2900-0x2bff
  * which might have be mirrored at 0x0100-0x03ff..
  */
-void pcibios_align_resource(void *data, struct resource *res, u64 size,
-				u64 align)
+void pcibios_align_resource(void *data, struct resource *res,
+				resource_size_t size, resource_size_t align)
 {
 	struct pci_dev *dev = data;
 
 	if (res->flags & IORESOURCE_IO) {
-		u64 start = res->start;
+		resource_size_t start = res->start;
 
 		if (size > 0x100) {
 			printk(KERN_ERR "PCI: I/O Region %s/%d too large"
 			       " (%lld bytes)\n", pci_name(dev),
-			       dev->resource - res, size);
+			       dev->resource - res, (unsigned long long)size);
 		}
 
 		if (start & 0x300) {
@@ -1756,7 +1756,7 @@ long sys_pciconfig_iobase(long which, un
 
 void pci_resource_to_user(const struct pci_dev *dev, int bar,
 			  const struct resource *rsrc,
-			  u64 *start, u64 *end)
+			  resource_size_t *start, resource_size_t *end)
 {
 	struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);
 	unsigned long offset = 0;
diff -puN arch/powerpc/kernel/pci_64.c~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/powerpc/kernel/pci_64.c
--- devel/arch/powerpc/kernel/pci_64.c~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/powerpc/kernel/pci_64.c	2006-05-11 15:18:14.000000000 -0700
@@ -138,11 +138,11 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
  * which might have be mirrored at 0x0100-0x03ff..
  */
 void pcibios_align_resource(void *data, struct resource *res,
-			    unsigned long size, unsigned long align)
+			    resource_size_t size, resource_size_t align)
 {
 	struct pci_dev *dev = data;
 	struct pci_controller *hose = pci_bus_to_host(dev->bus);
-	unsigned long start = res->start;
+	resource_size_t start = res->start;
 	unsigned long alignto;
 
 	if (res->flags & IORESOURCE_IO) {
diff -puN arch/ppc/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/ppc/Kconfig
--- devel/arch/ppc/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/ppc/Kconfig	2006-05-11 15:18:14.000000000 -0700
@@ -953,6 +953,13 @@ source kernel/Kconfig.hz
 source kernel/Kconfig.preempt
 source "mm/Kconfig"
 
+config RESOURCES_32BIT
+	bool "32 bit Memory and IO resources (EXPERIMENTAL)"
+	depends on EXPERIMENTAL
+	help
+	  By default resources are 64 bit. This option allows memory and IO
+	  resources to be 32 bit to optimize code size.
+
 source "fs/Kconfig.binfmt"
 
 config PREP_RESIDUAL
diff -puN arch/ppc/kernel/pci.c~kconfigurable-resources-arch-dependent-changes-arch-j-p arch/ppc/kernel/pci.c
--- devel/arch/ppc/kernel/pci.c~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/arch/ppc/kernel/pci.c	2006-05-11 15:18:14.000000000 -0700
@@ -171,13 +171,13 @@ EXPORT_SYMBOL(pcibios_bus_to_resource);
  * but we want to try to avoid allocating at 0x2900-0x2bff
  * which might have be mirrored at 0x0100-0x03ff..
  */
-void pcibios_align_resource(void *data, struct resource *res, u64 size,
-		       u64 align)
+void pcibios_align_resource(void *data, struct resource *res,
+				resource_size_t size, resource_size_t align)
 {
 	struct pci_dev *dev = data;
 
 	if (res->flags & IORESOURCE_IO) {
-		u64 start = res->start;
+		resource_size_t start = res->start;
 
 		if (size > 0x100) {
 			printk(KERN_ERR "PCI: I/O Region %s/%d too large"
@@ -960,8 +960,8 @@ static pgprot_t __pci_mmap_set_pgprot(st
 	else
 		prot |= _PAGE_GUARDED;
 
-	printk("PCI map for %s:%llx, prot: %llx\n", pci_name(dev), rp->start,
-	       prot);
+	printk("PCI map for %s:%llx, prot: %lx\n", pci_name(dev),
+		(unsigned long long)rp->start, prot);
 
 	return __pgprot(prot);
 }
@@ -1131,7 +1131,7 @@ long sys_pciconfig_iobase(long which, un
 
 void pci_resource_to_user(const struct pci_dev *dev, int bar,
 			  const struct resource *rsrc,
-			  u64 *start, u64 *end)
+			  resource_size_t *start, resource_size_t *end)
 {
 	struct pci_controller *hose = pci_bus_to_hose(dev->bus->number);
 	unsigned long offset = 0;
diff -puN include/asm-powerpc/pci.h~kconfigurable-resources-arch-dependent-changes-arch-j-p include/asm-powerpc/pci.h
--- devel/include/asm-powerpc/pci.h~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/include/asm-powerpc/pci.h	2006-05-11 15:18:14.000000000 -0700
@@ -242,7 +242,7 @@ extern pgprot_t	pci_phys_mem_access_prot
 #define HAVE_ARCH_PCI_RESOURCE_TO_USER
 extern void pci_resource_to_user(const struct pci_dev *dev, int bar,
 				 const struct resource *rsrc,
-				 u64 *start, u64 *end);
+				 resource_size_t *start, resource_size_t *end);
 #endif /* CONFIG_PPC_MULTIPLATFORM || CONFIG_PPC32 */
 
 #endif	/* __KERNEL__ */
diff -puN include/asm-ppc/pci.h~kconfigurable-resources-arch-dependent-changes-arch-j-p include/asm-ppc/pci.h
--- devel/include/asm-ppc/pci.h~kconfigurable-resources-arch-dependent-changes-arch-j-p	2006-05-11 15:18:14.000000000 -0700
+++ devel-akpm/include/asm-ppc/pci.h	2006-05-11 15:18:14.000000000 -0700
@@ -133,7 +133,7 @@ extern pgprot_t	pci_phys_mem_access_prot
 #define HAVE_ARCH_PCI_RESOURCE_TO_USER
 extern void pci_resource_to_user(const struct pci_dev *dev, int bar,
 				 const struct resource *rsrc,
-				 u64 *start, u64 *end);
+				 resource_size_t *start, resource_size_t *end);
 
 
 #endif	/* __KERNEL__ */
_

Patches currently in -mm which might be from vgoyal@xxxxxxxxxx are

i386-export-memory-more-than-4g-through-proc-iomem.patch
kconfigurable-resources-core-changes-i386-fix.patch
kconfigurable-resources-core-changes-fix.patch
typesh-sector_t-and-blkcnt_t-arent-for-userspace.patch
kconfigurable-resources-mtd-fixes.patch
mpt-fusion-driver-initialization-failure-fix.patch
register-hot-added-memory-to-iomem-resource.patch
updated-kdump-documentation.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux