Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
6074a139
Commit
6074a139
authored
Jun 26, 2013
by
Geert Uytterhoeven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
m68k/setup: Use pr_*() and __func__ instead of plain printk()
Signed-off-by:
Geert Uytterhoeven
<
geert@linux-m68k.org
>
parent
51b9310f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
9 deletions
+10
-9
arch/m68k/kernel/setup_mm.c
arch/m68k/kernel/setup_mm.c
+10
-9
No files found.
arch/m68k/kernel/setup_mm.c
View file @
6074a139
...
...
@@ -161,7 +161,8 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record)
m68k_memory
[
m68k_num_memory
].
size
=
data
[
1
];
m68k_num_memory
++
;
}
else
printk
(
"m68k_parse_bootinfo: too many memory chunks
\n
"
);
pr_warn
(
"%s: too many memory chunks
\n
"
,
__func__
);
break
;
case
BI_RAMDISK
:
...
...
@@ -197,7 +198,7 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record)
unknown
=
1
;
}
if
(
unknown
)
pr
intk
(
"m68k_parse_bootinfo: unknown tag 0x%04x ignored
\n
"
,
pr
_warn
(
"%s: unknown tag 0x%04x ignored
\n
"
,
__func__
,
record
->
tag
);
record
=
(
struct
bi_record
*
)((
unsigned
long
)
record
+
record
->
size
);
...
...
@@ -206,8 +207,8 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record)
m68k_realnum_memory
=
m68k_num_memory
;
#ifdef CONFIG_SINGLE_MEMORY_CHUNK
if
(
m68k_num_memory
>
1
)
{
pr
intk
(
"I
gnoring last %i chunks of physical memory
\n
"
,
(
m68k_num_memory
-
1
));
pr
_warn
(
"%s: i
gnoring last %i chunks of physical memory
\n
"
,
__func__
,
(
m68k_num_memory
-
1
));
m68k_num_memory
=
1
;
}
#endif
...
...
@@ -247,7 +248,7 @@ void __init setup_arch(char **cmdline_p)
asm
(
".chip 68060; movec %%pcr,%0; .chip 68k"
:
"=d"
(
pcr
));
if
(((
pcr
>>
8
)
&
0xff
)
<=
5
)
{
pr
intk
(
"Enabling workaround for errata I14
\n
"
);
pr
_warn
(
"Enabling workaround for errata I14
\n
"
);
asm
(
".chip 68060; movec %0,%%pcr; .chip 68k"
:
:
"d"
(
pcr
|
0x20
));
}
...
...
@@ -353,7 +354,7 @@ void __init setup_arch(char **cmdline_p)
BOOTMEM_DEFAULT
);
initrd_start
=
(
unsigned
long
)
phys_to_virt
(
m68k_ramdisk
.
addr
);
initrd_end
=
initrd_start
+
m68k_ramdisk
.
size
;
pr
intk
(
"initrd: %08lx - %08lx
\n
"
,
initrd_start
,
initrd_end
);
pr
_info
(
"initrd: %08lx - %08lx
\n
"
,
initrd_start
,
initrd_end
);
}
#endif
...
...
@@ -538,9 +539,9 @@ void check_bugs(void)
{
#ifndef CONFIG_M68KFPU_EMU
if
(
m68k_fputype
==
0
)
{
pr
intk
(
KERN_EMERG
"*** YOU DO NOT HAVE A FLOATING POINT UNIT, "
pr
_emerg
(
"*** YOU DO NOT HAVE A FLOATING POINT UNIT, "
"WHICH IS REQUIRED BY LINUX/M68K ***
\n
"
);
pr
intk
(
KERN_EMERG
"Upgrade your hardware or join the FPU "
pr
_emerg
(
"Upgrade your hardware or join the FPU "
"emulation project
\n
"
);
panic
(
"no FPU"
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment