Messages in this thread Patch in this message | | | Subject | Re: [2.6 patch] let IA64_GENERIC select more stuff | From | Jes Sorensen <> | Date | 09 Feb 2006 08:26:58 -0500 |
| |
>>>>> "Matthew" == Matthew Wilcox <matthew@wil.cx> writes:
Matthew> On Thu, Feb 09, 2006 at 07:53:11AM -0500, Jes Sorensen wrote: >> There's other reasons why this is a moot exercise anyway, >> allyesconfig doesn't link on ia64 due to the size of the object >> exceeding the reach of the relative link relocs. Not much you can >> do about that.
Matthew> That'd be a toolchain problem then ... need to insert stubs.
True, but I think there's a special flag people need to use when linking large userland apps. No idea if it could work for the kernel in this case.
>> - HP100 driver cannot be compiled on systems without ISA support in >> it's current state.
Matthew> I have it enabled on parisc without ISA or EISA. More Matthew> details, please.
Generous use of isa_memcpy_toio, isa_readb etc. Those functions ought not be visible in a config where ISA is disabled. Anybody who cares enough about this could easily fix the HP100 driver to deal with it, but it would require some reorganization of the code.
>> config HP100 tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support" >> - depends on NET_ETHERNET && (ISA || EISA || PCI) + depends on >> NET_ETHERNET && ISA || EISA help
Matthew> Also I think this is wrong. Doesn't the precedence make this Matthew> evaluate as (NET_ETHERNET && ISA) || EISA ?
Thats me being stupid, the parenthesis should have stayed.
Updated patch attached.
Cheers, Jes
Various fixes to help allyesconfig on ia64: - ARCH_FLATMEM_ENABLE is incompatible with NUMA - atm code tries to include kernel headers to decide upon byteorder without allowing for said header file to include other files - HP100 driver cannot be compiled on systems without ISA support in it's current state. - Add check_signature() to include/asm-ia64/io.h - Include vmalloc.h in mixart_hwdep.c which uses vmalloc
Signed-off-by: Jes Sorensen <jes@sgi.com>
----
arch/ia64/Kconfig | 1 + drivers/atm/Makefile | 2 +- drivers/net/Kconfig | 2 +- include/asm-ia64/io.h | 15 +++++++++++++++ sound/pci/mixart/mixart_hwdep.c | 1 + 5 files changed, 19 insertions(+), 2 deletions(-)
Index: linux-2.6/arch/ia64/Kconfig =================================================================== --- linux-2.6.orig/arch/ia64/Kconfig +++ linux-2.6/arch/ia64/Kconfig @@ -297,6 +297,7 @@ See <file:Documentation/vm/numa> for more. config ARCH_FLATMEM_ENABLE + depends on !NUMA def_bool y config ARCH_SPARSEMEM_ENABLE Index: linux-2.6/drivers/atm/Makefile =================================================================== --- linux-2.6.orig/drivers/atm/Makefile +++ linux-2.6/drivers/atm/Makefile @@ -41,7 +41,7 @@ # guess the target endianess to choose the right PCA-200E firmware image ifeq ($(CONFIG_ATM_FORE200E_PCA_DEFAULT_FW),y) byteorder.h := include$(if $(patsubst $(srctree),,$(objtree)),2)/asm/byteorder.h - CONFIG_ATM_FORE200E_PCA_FW := $(obj)/pca200e$(if $(shell $(CC) -E -dM $(byteorder.h) | grep ' __LITTLE_ENDIAN '),.bin,_ecd.bin2) + CONFIG_ATM_FORE200E_PCA_FW := $(obj)/pca200e$(if $(shell $(CC) -I$(srctree)/include -E -dM $(byteorder.h) | grep ' __LITTLE_ENDIAN '),.bin,_ecd.bin2) endif endif Index: linux-2.6/drivers/net/Kconfig =================================================================== --- linux-2.6.orig/drivers/net/Kconfig +++ linux-2.6/drivers/net/Kconfig @@ -946,7 +946,7 @@ config HP100 tristate "HP 10/100VG PCLAN (ISA, EISA, PCI) support" - depends on NET_ETHERNET && (ISA || EISA || PCI) + depends on NET_ETHERNET && (ISA || EISA) help If you have a network (Ethernet) card of this type, say Y and read the Ethernet-HOWTO, available from Index: linux-2.6/include/asm-ia64/io.h =================================================================== --- linux-2.6.orig/include/asm-ia64/io.h +++ linux-2.6/include/asm-ia64/io.h @@ -435,6 +435,21 @@ #define ioremap_nocache(o,s) ioremap(o,s) +static inline int +check_signature(void __iomem *io_addr, const unsigned char *signature, + int length) +{ + int retval = 0; + do { + if (readb(io_addr) != *signature++) + goto out; + io_addr++; + } while (--length); + retval = 1; + out: + return retval; +} + # ifdef __KERNEL__ /* Index: linux-2.6/sound/pci/mixart/mixart_hwdep.c =================================================================== --- linux-2.6.orig/sound/pci/mixart/mixart_hwdep.c +++ linux-2.6/sound/pci/mixart/mixart_hwdep.c @@ -24,6 +24,7 @@ #include <linux/interrupt.h> #include <linux/pci.h> #include <linux/firmware.h> +#include <linux/vmalloc.h> #include <asm/io.h> #include <sound/core.h> #include "mixart.h" - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |