Commit 6bb59750 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, mtrr: remove debug message
  x86: disable stack-protector for __restore_processor_state()
  x86: fix is_io_mapping_possible() build warning on i386 allnoconfig
  x86, setup: compile with -DDISABLE_BRANCH_PROFILING
  x86/dma: unify definition of pci_unmap_addr* and pci_unmap_len macros
  x86, mm: fix misuse of debug_kmap_atomic
  x86: remove duplicated code with pcpu_need_numa()
  x86,percpu: fix inverted NUMA test in setup_pcpu_remap()
  x86: signal: check sas_ss_size instead of sas_ss_flags()
parents 09f38dc1 c5c67c7c

arch/x86/boot/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ $(obj)/cpustr.h: $(obj)/mkcpustr FORCE 
# How to compile the 16-bit code.  Note we always compile for -march=i386,

# that way we can complain to the user if the CPU is insufficient.

KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \

		   -DDISABLE_BRANCH_PROFILING \

		   -Wall -Wstrict-prototypes \

		   -march=i386 -mregparm=3 \

		   -include $(srctree)/$(src)/code16gcc.h \

arch/x86/boot/compressed/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma h 


KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2

KBUILD_CFLAGS += -fno-strict-aliasing -fPIC

KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING

cflags-$(CONFIG_X86_64) := -mcmodel=small

KBUILD_CFLAGS += $(cflags-y)

KBUILD_CFLAGS += $(call cc-option,-ffreestanding)

arch/x86/include/asm/pci.h

+32 −4
Original line number Diff line number Diff line
@@ -89,11 +89,39 @@ extern void pci_iommu_alloc(void); 
/* MSI arch hook */

#define arch_setup_msi_irqs arch_setup_msi_irqs



#endif  /* __KERNEL__ */

#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)



#if defined(CONFIG_X86_64) || defined(CONFIG_DMA_API_DEBUG)



#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       \

	        dma_addr_t ADDR_NAME;

#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)         \

	        __u32 LEN_NAME;

#define pci_unmap_addr(PTR, ADDR_NAME)                  \

	        ((PTR)->ADDR_NAME)

#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)         \

	        (((PTR)->ADDR_NAME) = (VAL))

#define pci_unmap_len(PTR, LEN_NAME)                    \

	        ((PTR)->LEN_NAME)

#define pci_unmap_len_set(PTR, LEN_NAME, VAL)           \

	        (((PTR)->LEN_NAME) = (VAL))



#ifdef CONFIG_X86_32

# include "pci_32.h"

#else



#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       dma_addr_t ADDR_NAME[0];

#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) unsigned LEN_NAME[0];

#define pci_unmap_addr(PTR, ADDR_NAME)  sizeof((PTR)->ADDR_NAME)

#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \

	        do { break; } while (pci_unmap_addr(PTR, ADDR_NAME))

#define pci_unmap_len(PTR, LEN_NAME)            sizeof((PTR)->LEN_NAME)

#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \

	        do { break; } while (pci_unmap_len(PTR, LEN_NAME))



#endif



#endif  /* __KERNEL__ */



#ifdef CONFIG_X86_64

#include "pci_64.h"

#endif

arch/x86/include/asm/pci_32.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
#ifndef _ASM_X86_PCI_32_H

#define _ASM_X86_PCI_32_H





#ifdef __KERNEL__





/* Dynamic DMA mapping stuff.

 * i386 has everything mapped statically.

 */



struct pci_dev;



/* The PCI address space does equal the physical memory

 * address space.  The networking and block device layers use

 * this boolean for bounce buffer decisions.

 */

#define PCI_DMA_BUS_IS_PHYS	(1)



/* pci_unmap_{page,single} is a nop so... */

#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	dma_addr_t ADDR_NAME[0];

#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)	unsigned LEN_NAME[0];

#define pci_unmap_addr(PTR, ADDR_NAME)	sizeof((PTR)->ADDR_NAME)

#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \

	do { break; } while (pci_unmap_addr(PTR, ADDR_NAME))

#define pci_unmap_len(PTR, LEN_NAME)		sizeof((PTR)->LEN_NAME)

#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \

	do { break; } while (pci_unmap_len(PTR, LEN_NAME))





#endif /* __KERNEL__ */





#endif /* _ASM_X86_PCI_32_H */

arch/x86/include/asm/pci_64.h

+0 −22
Original line number Diff line number Diff line
@@ -24,28 +24,6 @@ extern int (*pci_config_write)(int seg, int bus, int dev, int fn, 


extern void dma32_reserve_bootmem(void);



/* The PCI address space does equal the physical memory

 * address space.  The networking and block device layers use

 * this boolean for bounce buffer decisions

 *

 * On AMD64 it mostly equals, but we set it to zero if a hardware

 * IOMMU (gart) of sotware IOMMU (swiotlb) is available.

 */

#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)



#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	\

	dma_addr_t ADDR_NAME;

#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\

	__u32 LEN_NAME;

#define pci_unmap_addr(PTR, ADDR_NAME)			\

	((PTR)->ADDR_NAME)

#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\

	(((PTR)->ADDR_NAME) = (VAL))

#define pci_unmap_len(PTR, LEN_NAME)			\

	((PTR)->LEN_NAME)

#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\

	(((PTR)->LEN_NAME) = (VAL))



#endif /* __KERNEL__ */



#endif /* _ASM_X86_PCI_64_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE