AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ARC: UAPI Disintegrate arch/arc/include/asm

Browse Source 
1. ./genfilelist.pl arch/arc/include/asm/

2. Create arch/arc/include/uapi/asm/Kbuild as follows

	+# UAPI Header export list
	+include include/uapi/asm-generic/Kbuild.asm

3. ./disintegrate-one.pl arch/arc/include/{,uapi/}asm/<above-list>

4. Edit arch/arc/include/asm/Kbuild to remove ref to
	asm-generic/Kbuild.asm

- To work around empty uapi/asm/setup.h added a placholder comment.
- Also a manual #ifdef __ASSEMBLY__ for a late ptrace change

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Cc: David Howells <dhowells@redhat.com>
This commit is contained in:
Vineet Gupta 2013-02-11 19:55:33 +05:30
parent cbe056f76a
commit 8c2f4a8dd0
14 changed files with 108 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arc/include/asm/Kbuild
View File

@ -1,11 +1,3 @@
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

30
arch/arc/include/asm/page.h
View File

@ -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
#include <uapi/asm/page.h>
#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
#define PAGE_MASK (~(PAGE_SIZE-1))
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
@ -129,6 +103,4 @@ typedef unsigned long pgtable_t;
#endif /* !__ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif

38
arch/arc/include/asm/ptrace.h
View File

@ -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 */

3
arch/arc/include/asm/setup.h
View File

@ -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

11
arch/arc/include/uapi/asm/Kbuild Normal file
View File

@ -0,0 +1,11 @@
# 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

0
arch/arc/include/asm/byteorder.h → arch/arc/include/uapi/asm/byteorder.h
View File

0
arch/arc/include/asm/cachectl.h → arch/arc/include/uapi/asm/cachectl.h
View File

39
arch/arc/include/uapi/asm/page.h Normal file
View File

@ -0,0 +1,39 @@
/*
* Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef _UAPI__ASM_ARC_PAGE_H
#define _UAPI__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
#define PAGE_MASK (~(PAGE_SIZE-1))
#endif /* _UAPI__ASM_ARC_PAGE_H */

48
arch/arc/include/uapi/asm/ptrace.h Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
* Amit Bhor, Sameer Dhavale: Codito Technologies 2004
*/
#ifndef _UAPI__ASM_ARC_PTRACE_H
#define _UAPI__ASM_ARC_PTRACE_H
#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 /* _UAPI__ASM_ARC_PTRACE_H */

6
arch/arc/include/uapi/asm/setup.h Normal file
View File

@ -0,0 +1,6 @@
/*
* setup.h is part of userspace header ABI so UAPI scripts have to generate it
* even if there's nothing to export - causing empty <uapi/asm/setup.h>
* However to prevent "patch" from discarding it we add this placeholder
* comment
*/

0
arch/arc/include/asm/sigcontext.h → arch/arc/include/uapi/asm/sigcontext.h
View File

0
arch/arc/include/asm/signal.h → arch/arc/include/uapi/asm/signal.h
View File

0
arch/arc/include/asm/swab.h → arch/arc/include/uapi/asm/swab.h
View File

0
arch/arc/include/asm/unistd.h → arch/arc/include/uapi/asm/unistd.h
View File