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

Commit b5f3c61d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'parisc-3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc fixes from Helge Deller:
 "Drop the architecture-specifc value for_STK_LIM_MAX to fix stack
  related problems with GNU make"

* 'parisc-3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Use generic uapi/asm/resource.h file
  parisc: remove _STK_LIM_MAX override
parents ba6728f5 8a415e53

arch/parisc/include/uapi/asm/Kbuild

+2 −1
Original line number Diff line number Diff line 
# UAPI Header export list

include include/uapi/asm-generic/Kbuild.asm



generic-y += resource.h



header-y += bitsperlong.h

header-y += byteorder.h

header-y += errno.h
@@ -13,7 +15,6 @@ header-y += msgbuf.h 
header-y += pdc.h

header-y += posix_types.h

header-y += ptrace.h

header-y += resource.h

header-y += sembuf.h

header-y += setup.h

header-y += shmbuf.h

arch/parisc/include/uapi/asm/resource.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef _ASM_PARISC_RESOURCE_H

#define _ASM_PARISC_RESOURCE_H



#define _STK_LIM_MAX	10 * _STK_LIM

#include <asm-generic/resource.h>



#endif