Commit 66eddbfc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6:
  xtensa: Disable PCI and nfsroot on simulation target
  xtensa: Add missing include in coprocessor.h
  xtensa: Fix the network driver for the simulator target
  xtensa: Shuffle include statements to fix linker script
  xtensa: Add -mforce-no-pic option is supported
  xtensa: Fixes due to bss boundary symbol name changes.
  xtensa: Fix linker script patch-up
  xtensa: Fix FLUSH_DCACHE macro for some variants.
parents 6e575590 66630f71

arch/xtensa/Makefile

+2 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,8 @@ KBUILD_CFLAGS += -ffreestanding 




KBUILD_CFLAGS += -pipe -mlongcalls

KBUILD_CFLAGS += -pipe -mlongcalls





KBUILD_CFLAGS += $(call cc-option,-mforce-no-pic,)



vardirs := $(patsubst %,arch/xtensa/variants/%/,$(variant-y))

vardirs := $(patsubst %,arch/xtensa/variants/%/,$(variant-y))

plfdirs := $(patsubst %,arch/xtensa/platforms/%/,$(platform-y))

plfdirs := $(patsubst %,arch/xtensa/platforms/%/,$(platform-y))

arch/xtensa/configs/iss_defconfig

+485 −246

File changed.

Preview size limit exceeded, changes collapsed.

arch/xtensa/include/asm/cacheflush.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -115,6 +115,7 @@ extern void flush_cache_page(struct vm_area_struct*, unsigned long, unsigned lon 
#define flush_cache_vmap(start,end)			do { } while (0)

#define flush_cache_vmap(start,end)			do { } while (0)

#define flush_cache_vunmap(start,end)			do { } while (0)

#define flush_cache_vunmap(start,end)			do { } while (0)





#define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 0

#define flush_dcache_page(page)				do { } while (0)

#define flush_dcache_page(page)				do { } while (0)





#define flush_cache_page(vma,addr,pfn)			do { } while (0)

#define flush_cache_page(vma,addr,pfn)			do { } while (0)

arch/xtensa/include/asm/coprocessor.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ 
#define _XTENSA_COPROCESSOR_H

#define _XTENSA_COPROCESSOR_H





#include <linux/stringify.h>

#include <linux/stringify.h>

#include <variant/core.h>

#include <variant/tie.h>

#include <variant/tie.h>

#include <asm/types.h>

#include <asm/types.h>

arch/xtensa/include/asm/elf.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
#define _XTENSA_ELF_H

#define _XTENSA_ELF_H





#include <asm/ptrace.h>

#include <asm/ptrace.h>

#include <asm/coprocessor.h>





/* Xtensa processor ELF architecture-magic number */

/* Xtensa processor ELF architecture-magic number */