Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76d3f4c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-v3.11-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull first batch of ARC changes from Vineet Gupta:
 "There's a second bunch to follow next week - which depends on commits
  on other trees (irq/net).  I'd have preferred the accompanying ARC
  change via respective trees, but it didn't workout somehow.

  Highlights of changes:

   - Continuation of ARC MM changes from 3.10 including

       zero page optimization
       Setting pagecache pages dirty by default
       Non executable stack by default
       Reducing dcache flushes for aliasing VIPT config

   - Long overdue rework of pt_regs machinery - removing the unused word
     gutters and adding ECR register to baseline (helps cleanup lot of
     low level code)

   - Support for ARC gcc 4.8

   - Few other preventive fixes, cosmetics, usage of Kconfig helper..

  The diffstat is larger than normal primarily because of arcregs.h
  header split as well as beautification of macros in entry.h"

* tag 'arc-v3.11-rc1-part1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (32 commits)
  ARC: warn on improper stack unwind FDE entries
  arc: delete __cpuinit usage from all arc files
  ARC: [tlb-miss] Fix bug with CONFIG_ARC_DBG_TLB_MISS_COUNT
  ARC: [tlb-miss] Extraneous PTE bit testing/setting
  ARC: Adjustments for gcc 4.8
  ARC: Setup Vector Table Base in early boot
  ARC: Remove explicit passing around of ECR
  ARC: pt_regs update #5: Use real ECR for pt_regs->event vs. synth values
  ARC: stop using pt_regs->orig_r8
  ARC: pt_regs update #4: r25 saved/restored unconditionally
  ARC: K/U SP saved from one location in stack switching macro
  ARC: Entry Handler tweaks: Simplify branch for in-kernel preemption
  ARC: Entry Handler tweaks: Avoid hardcoded LIMMS for ECR values
  ARC: Increase readability of entry handlers
  ARC: pt_regs update #3: Remove unused gutter at start of callee_regs
  ARC: pt_regs update #2: Remove unused gutter at start of pt_regs
  ARC: pt_regs update #1: Align pt_regs end with end of kernel stack page
  ARC: pt_regs update #0: remove kernel stack canary
  ARC: [mm] Remove @write argument to do_page_fault()
  ARC: [mm] Make stack/heap Non-executable by default
  ...
parents c1101cbc baadb8fd

arch/arc/Kconfig

+1 −7
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ config ARC_CACHE_PAGES 


config ARC_CACHE_VIPT_ALIASING

	bool "Support VIPT Aliasing D$"

	depends on ARC_HAS_DCACHE

	default n



endif	#ARC_CACHE
@@ -361,13 +362,6 @@ config ARC_MISALIGN_ACCESS 
	  Use ONLY-IF-ABS-NECESSARY as it will be very slow and also can hide

	  potential bugs in code



config ARC_STACK_NONEXEC

	bool "Make stack non-executable"

	default n

	help

	  To disable the execute permissions of stack/heap of processes

	  which are enabled by default.



config HZ

	int "Timer Frequency"

	default 100

arch/arc/Makefile

+17 −11
Original line number Diff line number Diff line
@@ -9,25 +9,27 @@ 
UTS_MACHINE := arc



ifeq ($(CROSS_COMPILE),)

CROSS_COMPILE := arc-elf32-

CROSS_COMPILE := arc-linux-uclibc-

endif



KBUILD_DEFCONFIG := fpga_defconfig



cflags-y	+= -mA7 -fno-common -pipe -fno-builtin -D__linux__



LINUXINCLUDE	+=  -include ${src}/arch/arc/include/asm/defines.h



ifdef CONFIG_ARC_CURR_IN_REG

# For a global register defintion, make sure it gets passed to every file

# We had a customer reported bug where some code built in kernel was NOT using

# any kernel headers, and missing the r25 global register

# Can't do unconditionally (like above) because of recursive include issues

# Can't do unconditionally because of recursive include issues

# due to <linux/thread_info.h>

LINUXINCLUDE	+=  -include ${src}/arch/arc/include/asm/current.h

endif



atleast_gcc44 :=  $(call cc-ifversion, -gt, 0402, y)

upto_gcc42    :=  $(call cc-ifversion, -le, 0402, y)

upto_gcc44    :=  $(call cc-ifversion, -le, 0404, y)

atleast_gcc44 :=  $(call cc-ifversion, -ge, 0404, y)

atleast_gcc48 :=  $(call cc-ifversion, -ge, 0408, y)



cflags-$(atleast_gcc44)			+= -fsection-anchors



cflags-$(CONFIG_ARC_HAS_LLSC)		+= -mlock
@@ -35,6 +37,11 @@ cflags-$(CONFIG_ARC_HAS_SWAPE) += -mswape 
cflags-$(CONFIG_ARC_HAS_RTSC)		+= -mrtsc

cflags-$(CONFIG_ARC_DW2_UNWIND)		+= -fasynchronous-unwind-tables



# By default gcc 4.8 generates dwarf4 which kernel unwinder can't grok

ifeq ($(atleast_gcc48),y)

cflags-$(CONFIG_ARC_DW2_UNWIND)		+= -gdwarf-2

endif



ifndef CONFIG_CC_OPTIMIZE_FOR_SIZE

# Generic build system uses -O2, we want -O3

cflags-y  += -O3
@@ -48,11 +55,10 @@ cflags-$(disable_small_data) += -mno-sdata -fcall-used-gp 
cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= -mbig-endian

ldflags-$(CONFIG_CPU_BIG_ENDIAN)	+= -EB



# STAR 9000518362:

# STAR 9000518362: (fixed with binutils shipping with gcc 4.8)

# arc-linux-uclibc-ld (buildroot) or arceb-elf32-ld (EZChip) don't accept

# --build-id w/o "-marclinux".

# Default arc-elf32-ld is OK

ldflags-y				+= -marclinux

# --build-id w/o "-marclinux". Default arc-elf32-ld is OK

ldflags-$(upto_gcc44)			+= -marclinux



ARC_LIBGCC				:= -mA7

cflags-$(CONFIG_ARC_HAS_HW_MPY)		+= -multcost=16
@@ -66,8 +72,8 @@ ifndef CONFIG_ARC_HAS_HW_MPY 
# With gcc 4.4.7, -mno-mpy is enough to make any other related adjustments,

# e.g. increased cost of MPY. With gcc 4.2.1 this had to be explicitly hinted



	ifeq ($(upto_gcc42),y)

		ARC_LIBGCC	:= -marc600

	ifneq ($(atleast_gcc44),y)

		cflags-y	+= -multcost=30

	endif

endif

arch/arc/configs/fpga_defconfig

+1 −1
Original line number Diff line number Diff line 
CONFIG_CROSS_COMPILE="arc-elf32-"

CONFIG_CROSS_COMPILE="arc-linux-uclibc-"

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_DEFAULT_HOSTNAME="ARCLinux"

# CONFIG_SWAP is not set

arch/arc/configs/nsimosci_defconfig

+1 −1
Original line number Diff line number Diff line 
CONFIG_CROSS_COMPILE="arc-elf32-"

CONFIG_CROSS_COMPILE="arc-linux-uclibc-"

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_DEFAULT_HOSTNAME="ARCLinux"

# CONFIG_SWAP is not set

arch/arc/configs/tb10x_defconfig

+1 −1
Original line number Diff line number Diff line 
CONFIG_CROSS_COMPILE="arc-elf32-"

CONFIG_CROSS_COMPILE="arc-linux-uclibc-"

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_DEFAULT_HOSTNAME="tb10x"

CONFIG_SYSVIPC=y