Skip to content

Commit 8fdd78e

Browse files
torvaldstorvalds
committed
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
2 parents 31e06a4 + 93bbd0c commit 8fdd78e

File tree

5 files changed

+41
-33
lines changed

5 files changed

+41
-33
lines changed

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*
2+
* Port on Texas Instruments TMS320C6x architecture
3+
*
4+
* Copyright (C) 2004, 2009, 2010 2011 Texas Instruments Incorporated
5+
* Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)
6+
*
7+
* This program is free software; you can redistribute it and/or modify
8+
* it under the terms of the GNU General Public License version 2 as
9+
* published by the Free Software Foundation.
10+
*/
11+
#ifndef _ASM_C6X_SETUP_H
12+
#define _ASM_C6X_SETUP_H
13+
14+
#include <uapi/asm/setup.h>
15+
16+
#ifndef __ASSEMBLY__
17+
extern char c6x_command_line[COMMAND_LINE_SIZE];
18+
19+
extern int c6x_add_memory(phys_addr_t start, unsigned long size);
20+
21+
extern unsigned long ram_start;
22+
extern unsigned long ram_end;
23+
24+
extern int c6x_num_cores;
25+
extern unsigned int c6x_silicon_rev;
26+
extern unsigned int c6x_devstat;
27+
extern unsigned char c6x_fuse_mac[6];
28+
29+
extern void machine_init(unsigned long dt_ptr);
30+
extern void time_init(void);
31+
32+
#endif /* !__ASSEMBLY__ */
33+
#endif /* _ASM_C6X_SETUP_H */

‎arch/c6x/include/uapi/asm/Kbuild

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# UAPI Header export list
22
include include/uapi/asm-generic/Kbuild.asm
33

4+
generic-y += kvm_para.h
5+
46
header-y += byteorder.h
57
header-y += kvm_para.h
68
header-y += ptrace.h

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

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 3 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,6 @@
1-
/*
2-
* Port on Texas Instruments TMS320C6x architecture
3-
*
4-
* Copyright (C) 2004, 2009, 2010 2011 Texas Instruments Incorporated
5-
* Author: Aurelien Jacquiot (aurelien.jacquiot@jaluna.com)
6-
*
7-
* This program is free software; you can redistribute it and/or modify
8-
* it under the terms of the GNU General Public License version 2 as
9-
* published by the Free Software Foundation.
10-
*/
11-
#ifndef _ASM_C6X_SETUP_H
12-
#define _ASM_C6X_SETUP_H
1+
#ifndef _UAPI_ASM_C6X_SETUP_H
2+
#define _UAPI_ASM_C6X_SETUP_H
133

144
#define COMMAND_LINE_SIZE 1024
155

16-
#ifndef __ASSEMBLY__
17-
extern char c6x_command_line[COMMAND_LINE_SIZE];
18-
19-
extern int c6x_add_memory(phys_addr_t start, unsigned long size);
20-
21-
extern unsigned long ram_start;
22-
extern unsigned long ram_end;
23-
24-
extern int c6x_num_cores;
25-
extern unsigned int c6x_silicon_rev;
26-
extern unsigned int c6x_devstat;
27-
extern unsigned char c6x_fuse_mac[6];
28-
29-
extern void machine_init(unsigned long dt_ptr);
30-
extern void time_init(void);
31-
32-
#endif /* !__ASSEMBLY__ */
33-
#endif /* _ASM_C6X_SETUP_H */
6+
#endif /* _UAPI_ASM_C6X_SETUP_H */

‎arch/c6x/kernel/entry.S

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@ work_rescheduled:
277277
[A1] BNOP .S1 work_resched,5
278278

279279
work_notifysig:
280+
;; enable interrupts for do_notify_resume()
281+
UNMASK_INT B2
280282
B .S2 do_notify_resume
281283
LDW .D2T1 *+SP(REGS__END+8),A6 ; syscall flag
282284
ADDKPC .S2 resume_userspace,B3,1
@@ -427,8 +429,7 @@ ENTRY(ret_from_kernel_execve)
427429
ENDPROC(ret_from_kernel_execve)
428430

429431
;;
430-
;; These are the interrupt handlers, responsible for calling __do_IRQ()
431-
;; int6 is used for syscalls (see _system_call entry)
432+
;; These are the interrupt handlers, responsible for calling c6x_do_IRQ()
432433
;;
433434
.macro SAVE_ALL_INT
434435
SAVE_ALL IRP,ITSR

0 commit comments

Comments
 (0)