ARC: UAPI Disintegrate arch/arc/include/asm (8c2f4a8d) · Commits · 戴 / test

arch/arc/include/asm/Kbuild

+0 −8

Original line number	Diff line number	Diff line
		include include/asm-generic/Kbuild.asm

		# 7-Oct-12: Jeremy Bennett <jeremy.bennett@embecosm.com>. Some of these
		# headers, beyond those specified in the generic set are needed by user code.

		header-y += page.h
		header-y += cachectl.h

		generic-y += auxvec.h
		generic-y += bugs.h
		generic-y += bitsperlong.h

+1 −29

Original line number	Diff line number	Diff line
		@@ -5,37 +5,11 @@
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/

		#ifndef __ASM_ARC_PAGE_H
		#define __ASM_ARC_PAGE_H

		/* PAGE_SHIFT determines the page size */
		#if defined(CONFIG_ARC_PAGE_SIZE_16K)
		#define PAGE_SHIFT 14
		#elif defined(CONFIG_ARC_PAGE_SIZE_4K)
		#define PAGE_SHIFT 12
		#else
		/*
		* Default 8k
		* done this way (instead of under CONFIG_ARC_PAGE_SIZE_8K) because adhoc
		* user code (busybox appletlib.h) expects PAGE_SHIFT to be defined w/o
		* using the correct uClibc header and in their build our autoconf.h is
		* not available
		*/
		#define PAGE_SHIFT 13
		#endif

		#ifdef __ASSEMBLY__
		#define PAGE_SIZE (1 << PAGE_SHIFT)
		#define PAGE_OFFSET (0x80000000)
		#else
		#define PAGE_SIZE (1UL << PAGE_SHIFT) /* Default 8K */
		#define PAGE_OFFSET (0x80000000UL) /* Kernel starts at 2G onwards */
		#endif
		#include <uapi/asm/page.h>

		#define PAGE_MASK (~(PAGE_SIZE-1))

		#ifdef __KERNEL__

		#ifndef __ASSEMBLY__

		@@ -129,6 +103,4 @@ typedef unsigned long pgtable_t;

		#endif /* !__ASSEMBLY__ */

		#endif /* __KERNEL__ */

		#endif

+1 −37

Original line number	Diff line number	Diff line
		@@ -7,11 +7,10 @@
		*
		* Amit Bhor, Sameer Dhavale: Codito Technologies 2004
		*/

		#ifndef __ASM_ARC_PTRACE_H
		#define __ASM_ARC_PTRACE_H

		#ifdef __KERNEL__
		#include <uapi/asm/ptrace.h>

		#ifndef __ASSEMBLY__

		@@ -128,39 +127,4 @@ static inline long regs_return_value(struct pt_regs *regs)
		#define orig_r8_IS_IRQ1 0x0010
		#define orig_r8_IS_IRQ2 0x0020

		#endif /* __KERNEL__ */

		#ifndef __ASSEMBLY__
		/*
		* Userspace ABI: Register state needed by
		* -ptrace (gdbserver)
		* -sigcontext (SA_SIGNINFO signal frame)
		*
		* This is to decouple pt_regs from user-space ABI, to be able to change it
		* w/o affecting the ABI.
		* Although the layout (initial padding) is similar to pt_regs to have some
		* optimizations when copying pt_regs to/from user_regs_struct.
		*
		* Also, sigcontext only care about the scratch regs as that is what we really
		* save/restore for signal handling.
		*/
		struct user_regs_struct {

		struct scratch {
		long pad;
		long bta, lp_start, lp_end, lp_count;
		long status32, ret, blink, fp, gp;
		long r12, r11, r10, r9, r8, r7, r6, r5, r4, r3, r2, r1, r0;
		long sp;
		} scratch;
		struct callee {
		long pad;
		long r25, r24, r23, r22, r21, r20;
		long r19, r18, r17, r16, r15, r14, r13;
		} callee;
		long efa; /* break pt addr, for break points in delay slots */
		long stop_pc; /* give dbg stop_pc directly after checking orig_r8 */
		};
		#endif /* !__ASSEMBLY__ */

		#endif /* __ASM_PTRACE_H */

+2 −1

Original line number	Diff line number	Diff line
		@@ -5,11 +5,12 @@
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		*/

		#ifndef __ASMARC_SETUP_H
		#define __ASMARC_SETUP_H


		#include <linux/types.h>
		#include <uapi/asm/setup.h>

		#define COMMAND_LINE_SIZE 256

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		# UAPI Header export list
		include include/uapi/asm-generic/Kbuild.asm
		header-y += page.h
		header-y += setup.h
		header-y += byteorder.h
		header-y += cachectl.h
		header-y += ptrace.h
		header-y += sigcontext.h
		header-y += signal.h
		header-y += swab.h
		header-y += unistd.h