Skip to content

Commit ab03e60

Browse files
committed
ia64: replace #include <asm/export.h> with #include <linux/export.h>
Commit ddb5cdb ("kbuild: generate KSYMTAB entries by modpost") deprecated <asm/export.h>, which is now a wrapper of <linux/export.h>. Replace #include <asm/export.h> with #include <linux/export.h>. After all the <asm/export.h> lines are converted, <asm/export.h> and <asm-generic/export.h> will be removed. Signed-off-by: Masahiro Yamada <[email protected]>
1 parent ee8aff7 commit ab03e60

21 files changed

+21
-25
lines changed

arch/ia64/kernel/entry.S

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* pNonSys: !pSys
3838
*/
3939

40-
40+
#include <linux/export.h>
4141
#include <linux/pgtable.h>
4242
#include <asm/asmmacro.h>
4343
#include <asm/cache.h>
@@ -49,7 +49,6 @@
4949
#include <asm/thread_info.h>
5050
#include <asm/unistd.h>
5151
#include <asm/ftrace.h>
52-
#include <asm/export.h>
5352

5453
#include "minstate.h"
5554

arch/ia64/kernel/esi_stub.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
#define PSR_BITS_TO_SET \
3535
(IA64_PSR_BN)
3636

37+
#include <linux/export.h>
3738
#include <asm/processor.h>
3839
#include <asm/asmmacro.h>
39-
#include <asm/export.h>
4040

4141
/*
4242
* Inputs:

arch/ia64/kernel/head.S

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* Support for CPU Hotplug
2121
*/
2222

23-
23+
#include <linux/export.h>
2424
#include <linux/pgtable.h>
2525
#include <asm/asmmacro.h>
2626
#include <asm/fpu.h>
@@ -33,7 +33,6 @@
3333
#include <asm/mca_asm.h>
3434
#include <linux/init.h>
3535
#include <linux/linkage.h>
36-
#include <asm/export.h>
3736

3837
#ifdef CONFIG_HOTPLUG_CPU
3938
#define SAL_PSR_BITS_TO_SET \

arch/ia64/kernel/ivt.S

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
* Table is based upon EAS2.6 (Oct 1999)
4848
*/
4949

50-
50+
#include <linux/export.h>
5151
#include <linux/pgtable.h>
5252
#include <asm/asmmacro.h>
5353
#include <asm/break.h>
@@ -58,7 +58,6 @@
5858
#include <asm/thread_info.h>
5959
#include <asm/unistd.h>
6060
#include <asm/errno.h>
61-
#include <asm/export.h>
6261

6362
#if 0
6463
# define PSR_DEFAULT_BITS psr.ac

arch/ia64/kernel/pal.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* 05/24/2000 eranian Added support for physical mode static calls
1414
*/
1515

16+
#include <linux/export.h>
1617
#include <asm/asmmacro.h>
1718
#include <asm/processor.h>
18-
#include <asm/export.h>
1919

2020
.data
2121
pal_entry_point:

arch/ia64/lib/clear_page.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
* 3/08/02 davidm Some more tweaking
1111
*/
1212

13+
#include <linux/export.h>
1314
#include <asm/asmmacro.h>
1415
#include <asm/page.h>
15-
#include <asm/export.h>
1616

1717
#ifdef CONFIG_ITANIUM
1818
# define L3_LINE_SIZE 64 // Itanium L3 line size

arch/ia64/lib/clear_user.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
* Stephane Eranian <[email protected]>
1313
*/
1414

15+
#include <linux/export.h>
1516
#include <asm/asmmacro.h>
16-
#include <asm/export.h>
1717

1818
//
1919
// arguments

arch/ia64/lib/copy_page.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*
1616
* 4/06/01 davidm Tuned to make it perform well both for cached and uncached copies.
1717
*/
18+
#include <linux/export.h>
1819
#include <asm/asmmacro.h>
1920
#include <asm/page.h>
20-
#include <asm/export.h>
2121

2222
#define PIPE_DEPTH 3
2323
#define EPI p[PIPE_DEPTH-1]

arch/ia64/lib/copy_page_mck.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
* to fetch the second-half of the L2 cache line into L1, and the tX words are copied in
6161
* an order that avoids bank conflicts.
6262
*/
63+
#include <linux/export.h>
6364
#include <asm/asmmacro.h>
6465
#include <asm/page.h>
65-
#include <asm/export.h>
6666

6767
#define PREFETCH_DIST 8 // McKinley sustains 16 outstanding L2 misses (8 ld, 8 st)
6868

arch/ia64/lib/copy_user.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
* - fix extraneous stop bit introduced by the EX() macro.
3131
*/
3232

33+
#include <linux/export.h>
3334
#include <asm/asmmacro.h>
34-
#include <asm/export.h>
3535

3636
//
3737
// Tuneable parameters

arch/ia64/lib/flush.S

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
* 05/28/05 Zoltan Menyhart Dynamic stride size
99
*/
1010

11+
#include <linux/export.h>
1112
#include <asm/asmmacro.h>
12-
#include <asm/export.h>
13-
1413

1514
/*
1615
* flush_icache_range(start,end)

arch/ia64/lib/idiv32.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
* (http://www.goodreads.com/book/show/2019887.Ia_64_and_Elementary_Functions)
1616
*/
1717

18+
#include <linux/export.h>
1819
#include <asm/asmmacro.h>
19-
#include <asm/export.h>
2020

2121
#ifdef MODULO
2222
# define OP mod

arch/ia64/lib/idiv64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
* (http://www.goodreads.com/book/show/2019887.Ia_64_and_Elementary_Functions)
1616
*/
1717

18+
#include <linux/export.h>
1819
#include <asm/asmmacro.h>
19-
#include <asm/export.h>
2020

2121
#ifdef MODULO
2222
# define OP mod

arch/ia64/lib/ip_fast_csum.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* Copyright (C) 2002, 2006 Ken Chen <[email protected]>
1414
*/
1515

16+
#include <linux/export.h>
1617
#include <asm/asmmacro.h>
17-
#include <asm/export.h>
1818

1919
/*
2020
* Since we know that most likely this function is called with buf aligned

arch/ia64/lib/memcpy.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* Stephane Eranian <[email protected]>
1515
* David Mosberger-Tang <[email protected]>
1616
*/
17+
#include <linux/export.h>
1718
#include <asm/asmmacro.h>
18-
#include <asm/export.h>
1919

2020
GLOBAL_ENTRY(memcpy)
2121

arch/ia64/lib/memcpy_mck.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* Copyright (C) 2002 Intel Corp.
1515
* Copyright (C) 2002 Ken Chen <[email protected]>
1616
*/
17+
#include <linux/export.h>
1718
#include <asm/asmmacro.h>
1819
#include <asm/page.h>
19-
#include <asm/export.h>
2020

2121
#define EK(y...) EX(y)
2222

arch/ia64/lib/memset.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
Since a stf.spill f0 can store 16B in one go, we use this instruction
1919
to get peak speed when value = 0. */
2020

21+
#include <linux/export.h>
2122
#include <asm/asmmacro.h>
22-
#include <asm/export.h>
2323
#undef ret
2424

2525
#define dest in0

arch/ia64/lib/strlen.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
* 09/24/99 S.Eranian add speculation recovery code
1818
*/
1919

20+
#include <linux/export.h>
2021
#include <asm/asmmacro.h>
21-
#include <asm/export.h>
2222

2323
//
2424
//

arch/ia64/lib/strncpy_from_user.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
* by Andreas Schwab <[email protected]>).
1818
*/
1919

20+
#include <linux/export.h>
2021
#include <asm/asmmacro.h>
21-
#include <asm/export.h>
2222

2323
GLOBAL_ENTRY(__strncpy_from_user)
2424
alloc r2=ar.pfs,3,0,0,0

arch/ia64/lib/strnlen_user.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
* Copyright (C) 1999, 2001 David Mosberger-Tang <[email protected]>
1414
*/
1515

16+
#include <linux/export.h>
1617
#include <asm/asmmacro.h>
17-
#include <asm/export.h>
1818

1919
GLOBAL_ENTRY(__strnlen_user)
2020
.prologue

arch/ia64/lib/xor.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* Optimized RAID-5 checksumming functions for IA-64.
66
*/
77

8+
#include <linux/export.h>
89
#include <asm/asmmacro.h>
9-
#include <asm/export.h>
1010

1111
GLOBAL_ENTRY(xor_ia64_2)
1212
.prologue

0 commit comments

Comments
 (0)