Commit 8fdd78ee authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming 

Pull C6X fixes from Mark Salter.

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  c6x: use generic kvm_para.h
  c6x: remove internal kernel symbols from exported setup.h
  c6x: fix misleading comment
  c6x: run do_notify_resume with interrupts enabled
parents 31e06a42 93bbd0c0

arch/c6x/include/asm/setup.h

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 *  Port on Texas Instruments TMS320C6x architecture

 *

 *  Copyright (C) 2004, 2009, 2010 2011 Texas Instruments Incorporated

 *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.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 _ASM_C6X_SETUP_H

#define _ASM_C6X_SETUP_H



#include <uapi/asm/setup.h>



#ifndef __ASSEMBLY__

extern char c6x_command_line[COMMAND_LINE_SIZE];



extern int c6x_add_memory(phys_addr_t start, unsigned long size);



extern unsigned long ram_start;

extern unsigned long ram_end;



extern int c6x_num_cores;

extern unsigned int c6x_silicon_rev;

extern unsigned int c6x_devstat;

extern unsigned char c6x_fuse_mac[6];



extern void machine_init(unsigned long dt_ptr);

extern void time_init(void);



#endif /* !__ASSEMBLY__ */

#endif /* _ASM_C6X_SETUP_H */

arch/c6x/include/uapi/asm/Kbuild

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

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



generic-y += kvm_para.h



header-y += byteorder.h

header-y += kvm_para.h

header-y += ptrace.h

arch/c6x/include/uapi/asm/kvm_para.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/kvm_para.h>

arch/c6x/include/uapi/asm/setup.h

+3 −30
Original line number Diff line number Diff line 
/*

 *  Port on Texas Instruments TMS320C6x architecture

 *

 *  Copyright (C) 2004, 2009, 2010 2011 Texas Instruments Incorporated

 *  Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.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 _ASM_C6X_SETUP_H

#define _ASM_C6X_SETUP_H

#ifndef _UAPI_ASM_C6X_SETUP_H

#define _UAPI_ASM_C6X_SETUP_H



#define COMMAND_LINE_SIZE   1024



#ifndef __ASSEMBLY__

extern char c6x_command_line[COMMAND_LINE_SIZE];



extern int c6x_add_memory(phys_addr_t start, unsigned long size);



extern unsigned long ram_start;

extern unsigned long ram_end;



extern int c6x_num_cores;

extern unsigned int c6x_silicon_rev;

extern unsigned int c6x_devstat;

extern unsigned char c6x_fuse_mac[6];



extern void machine_init(unsigned long dt_ptr);

extern void time_init(void);



#endif /* !__ASSEMBLY__ */

#endif /* _ASM_C6X_SETUP_H */
 
#endif /* _UAPI_ASM_C6X_SETUP_H */

arch/c6x/kernel/entry.S

+3 −2
Original line number Diff line number Diff line
@@ -277,6 +277,8 @@ work_rescheduled: 
 [A1]	BNOP	.S1	work_resched,5



work_notifysig:

	;; enable interrupts for do_notify_resume()

	UNMASK_INT B2

	B	.S2	do_notify_resume

	LDW	.D2T1	*+SP(REGS__END+8),A6 ; syscall flag

	ADDKPC	.S2	resume_userspace,B3,1
@@ -427,8 +429,7 @@ ENTRY(ret_from_kernel_execve) 
ENDPROC(ret_from_kernel_execve)



	;;

	;; These are the interrupt handlers, responsible for calling __do_IRQ()

	;; int6 is used for syscalls (see _system_call entry)

	;; These are the interrupt handlers, responsible for calling c6x_do_IRQ()

	;;

	.macro SAVE_ALL_INT

	SAVE_ALL IRP,ITSR

CRA Git | Maintained and supported by SUSTech CRA and CCSE