Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of https://github.com/openrisc/linux
Pull OpenRISC updates from Stafford Horne:
- Replace __ASSEMBLY__ with __ASSEMBLER__ in headers (Thomas Huth)
* tag 'for-linus' of https://github.com/openrisc/linux:
openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers
openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in uapi headers
+17
-17
+1
-1
arch/openrisc/include/asm/mmu.h
+1
-1
arch/openrisc/include/asm/mmu.h
+4
-4
arch/openrisc/include/asm/page.h
+4
-4
arch/openrisc/include/asm/page.h
···
25
25
*/
26
26
#include <asm/setup.h>
27
27
28
-
#ifndef __ASSEMBLY__
28
+
#ifndef __ASSEMBLER__
29
29
30
30
#define clear_page(page) memset((page), 0, PAGE_SIZE)
31
31
#define copy_page(to, from) memcpy((to), (from), PAGE_SIZE)
···
55
55
#define __pgd(x) ((pgd_t) { (x) })
56
56
#define __pgprot(x) ((pgprot_t) { (x) })
57
57
58
-
#endif /* !__ASSEMBLY__ */
58
+
#endif /* !__ASSEMBLER__ */
59
59
60
60
61
-
#ifndef __ASSEMBLY__
61
+
#ifndef __ASSEMBLER__
62
62
63
63
#define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET))
64
64
#define __pa(x) ((unsigned long) (x) - PAGE_OFFSET)
···
73
73
74
74
#define virt_addr_valid(kaddr) (pfn_valid(virt_to_pfn(kaddr)))
75
75
76
-
#endif /* __ASSEMBLY__ */
76
+
#endif /* __ASSEMBLER__ */
77
77
78
78
#include <asm-generic/memory_model.h>
79
79
#include <asm-generic/getorder.h>
+2
-2
arch/openrisc/include/asm/pgtable.h
+2
-2
arch/openrisc/include/asm/pgtable.h
···
23
23
24
24
#include <asm-generic/pgtable-nopmd.h>
25
25
26
-
#ifndef __ASSEMBLY__
26
+
#ifndef __ASSEMBLER__
27
27
#include <asm/mmu.h>
28
28
#include <asm/fixmap.h>
29
29
···
430
430
431
431
typedef pte_t *pte_addr_t;
432
432
433
-
#endif /* __ASSEMBLY__ */
433
+
#endif /* __ASSEMBLER__ */
434
434
#endif /* __ASM_OPENRISC_PGTABLE_H */
+2
-2
arch/openrisc/include/asm/processor.h
+2
-2
arch/openrisc/include/asm/processor.h
···
39
39
*/
40
40
#define TASK_UNMAPPED_BASE (TASK_SIZE / 8 * 3)
41
41
42
-
#ifndef __ASSEMBLY__
42
+
#ifndef __ASSEMBLER__
43
43
44
44
struct task_struct;
45
45
···
78
78
79
79
#define cpu_relax() barrier()
80
80
81
-
#endif /* __ASSEMBLY__ */
81
+
#endif /* __ASSEMBLER__ */
82
82
#endif /* __ASM_OPENRISC_PROCESSOR_H */
+2
-2
arch/openrisc/include/asm/ptrace.h
+2
-2
arch/openrisc/include/asm/ptrace.h
···
27
27
* they share a cacheline (not done yet, though... future optimization).
28
28
*/
29
29
30
-
#ifndef __ASSEMBLY__
30
+
#ifndef __ASSEMBLER__
31
31
/*
32
32
* This struct describes how the registers are laid out on the kernel stack
33
33
* during a syscall or other kernel entry.
···
147
147
return *(unsigned long *)((unsigned long)regs + offset);
148
148
}
149
149
150
-
#endif /* __ASSEMBLY__ */
150
+
#endif /* __ASSEMBLER__ */
151
151
152
152
/*
153
153
* Offsets used by 'ptrace' system call interface.
+1
-1
arch/openrisc/include/asm/setup.h
+1
-1
arch/openrisc/include/asm/setup.h
+4
-4
arch/openrisc/include/asm/thread_info.h
+4
-4
arch/openrisc/include/asm/thread_info.h
···
17
17
18
18
#ifdef __KERNEL__
19
19
20
-
#ifndef __ASSEMBLY__
20
+
#ifndef __ASSEMBLER__
21
21
#include <asm/types.h>
22
22
#include <asm/processor.h>
23
23
#endif
···
38
38
* - if the contents of this structure are changed, the assembly constants
39
39
* must also be changed
40
40
*/
41
-
#ifndef __ASSEMBLY__
41
+
#ifndef __ASSEMBLER__
42
42
43
43
struct thread_info {
44
44
struct task_struct *task; /* main task structure */
···
58
58
*
59
59
* preempt_count needs to be 1 initially, until the scheduler is functional.
60
60
*/
61
-
#ifndef __ASSEMBLY__
61
+
#ifndef __ASSEMBLER__
62
62
#define INIT_THREAD_INFO(tsk) \
63
63
{ \
64
64
.task = &tsk, \
···
75
75
#define get_thread_info(ti) get_task_struct((ti)->task)
76
76
#define put_thread_info(ti) put_task_struct((ti)->task)
77
77
78
-
#endif /* !__ASSEMBLY__ */
78
+
#endif /* !__ASSEMBLER__ */
79
79
80
80
/*
81
81
* thread information flags