Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+41
-33
+33
arch/c6x/include/asm/setup.h
+33
arch/c6x/include/asm/setup.h
···
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 */
+2
arch/c6x/include/uapi/asm/Kbuild
+2
arch/c6x/include/uapi/asm/Kbuild
-1
arch/c6x/include/uapi/asm/kvm_para.h
-1
arch/c6x/include/uapi/asm/kvm_para.h
···
1
-
#include <asm-generic/kvm_para.h>
+3
-30
arch/c6x/include/uapi/asm/setup.h
+3
-30
arch/c6x/include/uapi/asm/setup.h
···
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
13
3
14
4
#define COMMAND_LINE_SIZE 1024
15
5
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 */
+3
-2
arch/c6x/kernel/entry.S
+3
-2
arch/c6x/kernel/entry.S
···
277
277
[A1] BNOP .S1 work_resched,5
278
278
279
279
work_notifysig:
280
+
;; enable interrupts for do_notify_resume()
281
+
UNMASK_INT B2
280
282
B .S2 do_notify_resume
281
283
LDW .D2T1 *+SP(REGS__END+8),A6 ; syscall flag
282
284
ADDKPC .S2 resume_userspace,B3,1
···
429
427
ENDPROC(ret_from_kernel_execve)
430
428
431
429
;;
432
-
;; These are the interrupt handlers, responsible for calling __do_IRQ()
433
-
;; int6 is used for syscalls (see _system_call entry)
430
+
;; These are the interrupt handlers, responsible for calling c6x_do_IRQ()
434
431
;;
435
432
.macro SAVE_ALL_INT
436
433
SAVE_ALL IRP,ITSR