Commit 7cb7beb3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6:
  arch/ia64/kernel/iosapic: missing test after ioremap()
  ia64/topology.c: exit cache_add_dev when kobject_init_and_add fails
  arch/ia64/Makefile: Remove -mtune=merced in IA64 kernel build
  IA64: includecheck fix: ia64, pgtable.h
  IA64: includecheck fix: ia64, ia64_ksyms.c
  ia64: boolean __test_and_clear_bit
  Bug Fix arch/ia64/kernel/pci-dma.c: fix recursive dma_supported() call in iommu_dma_supported()
parents 4d9c73f6 e7369e01

arch/ia64/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -41,11 +41,6 @@ $(error Sorry, you need a newer version of the assember, one that is built from 
		ftp://ftp.hpl.hp.com/pub/linux-ia64/gas-030124.tar.gz)

endif



ifeq ($(call cc-version),0304)

	cflags-$(CONFIG_ITANIUM)	+= -mtune=merced

	cflags-$(CONFIG_MCKINLEY)	+= -mtune=mckinley

endif



KBUILD_CFLAGS += $(cflags-y)

head-y := arch/ia64/kernel/head.o arch/ia64/kernel/init_task.o

arch/ia64/include/asm/bitops.h

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ __test_and_clear_bit(int nr, volatile void * addr) 
{

	__u32 *p = (__u32 *) addr + (nr >> 5);

	__u32 m = 1 << (nr & 31);

	int oldbitset = *p & m;

	int oldbitset = (*p & m) != 0;



	*p &= ~m;

	return oldbitset;

arch/ia64/include/asm/pgtable.h

+0 −1
Original line number Diff line number Diff line
@@ -155,7 +155,6 @@ 
#include <linux/bitops.h>

#include <asm/cacheflush.h>

#include <asm/mmu_context.h>

#include <asm/processor.h>



/*

 * Next come the mappings that determine how mmap() protection bits

arch/ia64/kernel/ia64_ksyms.c

+1 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ EXPORT_SYMBOL(csum_ipv6_magic); 


#include <asm/page.h>

EXPORT_SYMBOL(clear_page);

EXPORT_SYMBOL(copy_page);



#ifdef CONFIG_VIRTUAL_MEM_MAP

#include <linux/bootmem.h>
@@ -60,9 +61,6 @@ EXPORT_SYMBOL(__udivdi3); 
EXPORT_SYMBOL(__moddi3);

EXPORT_SYMBOL(__umoddi3);



#include <asm/page.h>

EXPORT_SYMBOL(copy_page);



#if defined(CONFIG_MD_RAID456) || defined(CONFIG_MD_RAID456_MODULE)

extern void xor_ia64_2(void);

extern void xor_ia64_3(void);

arch/ia64/kernel/iosapic.c

+4 −0
Original line number Diff line number Diff line
@@ -1072,6 +1072,10 @@ iosapic_init (unsigned long phys_addr, unsigned int gsi_base) 
	}



	addr = ioremap(phys_addr, 0);

	if (addr == NULL) {

		spin_unlock_irqrestore(&iosapic_lock, flags);

		return -ENOMEM;

	}

	ver = iosapic_version(addr);

	if ((err = iosapic_check_gsi_range(gsi_base, ver))) {

		iounmap(addr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE