aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/m68k/kernel/dma.c4
-rw-r--r--arch/m68k/kernel/module.c12
-rw-r--r--arch/m68k/kernel/process.c20
-rw-r--r--arch/m68k/kernel/signal.c24
-rw-r--r--arch/m68k/kernel/uboot.c3
5 files changed, 26 insertions, 37 deletions
diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c
index 07070065a425..1e4f386ba31e 100644
--- a/arch/m68k/kernel/dma.c
+++ b/arch/m68k/kernel/dma.c
@@ -110,8 +110,8 @@ static void m68k_dma_sync_single_for_device(struct device *dev,
110 cache_clear(handle, size); 110 cache_clear(handle, size);
111 break; 111 break;
112 default: 112 default:
113 if (printk_ratelimit()) 113 pr_err_ratelimited("dma_sync_single_for_device: unsupported dir %u\n",
114 printk("dma_sync_single_for_device: unsupported dir %u\n", dir); 114 dir);
115 break; 115 break;
116 } 116 }
117} 117}
diff --git a/arch/m68k/kernel/module.c b/arch/m68k/kernel/module.c
index eb46fd6038ca..aaac2da318ff 100644
--- a/arch/m68k/kernel/module.c
+++ b/arch/m68k/kernel/module.c
@@ -12,9 +12,9 @@
12#include <linux/kernel.h> 12#include <linux/kernel.h>
13 13
14#if 0 14#if 0
15#define DEBUGP printk 15#define DEBUGP(fmt, ...) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
16#else 16#else
17#define DEBUGP(fmt...) 17#define DEBUGP(fmt, ...) no_printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__)
18#endif 18#endif
19 19
20#ifdef CONFIG_MODULES 20#ifdef CONFIG_MODULES
@@ -51,8 +51,8 @@ int apply_relocate(Elf32_Shdr *sechdrs,
51 *location += sym->st_value - (uint32_t)location; 51 *location += sym->st_value - (uint32_t)location;
52 break; 52 break;
53 default: 53 default:
54 printk(KERN_ERR "module %s: Unknown relocation: %u\n", 54 pr_err("module %s: Unknown relocation: %u\n", me->name,
55 me->name, ELF32_R_TYPE(rel[i].r_info)); 55 ELF32_R_TYPE(rel[i].r_info));
56 return -ENOEXEC; 56 return -ENOEXEC;
57 } 57 }
58 } 58 }
@@ -91,8 +91,8 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
91 *location = rel[i].r_addend + sym->st_value - (uint32_t)location; 91 *location = rel[i].r_addend + sym->st_value - (uint32_t)location;
92 break; 92 break;
93 default: 93 default:
94 printk(KERN_ERR "module %s: Unknown relocation: %u\n", 94 pr_err("module %s: Unknown relocation: %u\n", me->name,
95 me->name, ELF32_R_TYPE(rel[i].r_info)); 95 ELF32_R_TYPE(rel[i].r_info));
96 return -ENOEXEC; 96 return -ENOEXEC;
97 } 97 }
98 } 98 }
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c
index aaf28f8e342d..f0a8e9b332cd 100644
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
@@ -87,17 +87,17 @@ EXPORT_SYMBOL(pm_power_off);
87 87
88void show_regs(struct pt_regs * regs) 88void show_regs(struct pt_regs * regs)
89{ 89{
90 printk("\n"); 90 pr_info("Format %02x Vector: %04x PC: %08lx Status: %04x %s\n",
91 printk("Format %02x Vector: %04x PC: %08lx Status: %04x %s\n", 91 regs->format, regs->vector, regs->pc, regs->sr,
92 regs->format, regs->vector, regs->pc, regs->sr, print_tainted()); 92 print_tainted());
93 printk("ORIG_D0: %08lx D0: %08lx A2: %08lx A1: %08lx\n", 93 pr_info("ORIG_D0: %08lx D0: %08lx A2: %08lx A1: %08lx\n",
94 regs->orig_d0, regs->d0, regs->a2, regs->a1); 94 regs->orig_d0, regs->d0, regs->a2, regs->a1);
95 printk("A0: %08lx D5: %08lx D4: %08lx\n", 95 pr_info("A0: %08lx D5: %08lx D4: %08lx\n", regs->a0, regs->d5,
96 regs->a0, regs->d5, regs->d4); 96 regs->d4);
97 printk("D3: %08lx D2: %08lx D1: %08lx\n", 97 pr_info("D3: %08lx D2: %08lx D1: %08lx\n", regs->d3, regs->d2,
98 regs->d3, regs->d2, regs->d1); 98 regs->d1);
99 if (!(regs->sr & PS_S)) 99 if (!(regs->sr & PS_S))
100 printk("USP: %08lx\n", rdusp()); 100 pr_info("USP: %08lx\n", rdusp());
101} 101}
102 102
103void flush_thread(void) 103void flush_thread(void)
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index 8ead291a902a..093b7c42fb85 100644
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -598,9 +598,7 @@ static int mangle_kernel_stack(struct pt_regs *regs, int formatvec,
598 /* 598 /*
599 * user process trying to return with weird frame format 599 * user process trying to return with weird frame format
600 */ 600 */
601#ifdef DEBUG 601 pr_debug("user process returning with weird frame format\n");
602 printk("user process returning with weird frame format\n");
603#endif
604 return 1; 602 return 1;
605 } 603 }
606 if (!fsize) { 604 if (!fsize) {
@@ -846,10 +844,8 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
846 int err = 0, sig = ksig->sig; 844 int err = 0, sig = ksig->sig;
847 845
848 if (fsize < 0) { 846 if (fsize < 0) {
849#ifdef DEBUG 847 pr_debug("setup_frame: Unknown frame format %#x\n",
850 printk ("setup_frame: Unknown frame format %#x\n", 848 regs->format);
851 regs->format);
852#endif
853 return -EFAULT; 849 return -EFAULT;
854 } 850 }
855 851
@@ -905,9 +901,7 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
905 if (regs->stkadj) { 901 if (regs->stkadj) {
906 struct pt_regs *tregs = 902 struct pt_regs *tregs =
907 (struct pt_regs *)((ulong)regs + regs->stkadj); 903 (struct pt_regs *)((ulong)regs + regs->stkadj);
908#ifdef DEBUG 904 pr_debug("Performing stackadjust=%04lx\n", regs->stkadj);
909 printk("Performing stackadjust=%04x\n", regs->stkadj);
910#endif
911 /* This must be copied with decreasing addresses to 905 /* This must be copied with decreasing addresses to
912 handle overlaps. */ 906 handle overlaps. */
913 tregs->vector = 0; 907 tregs->vector = 0;
@@ -926,10 +920,8 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
926 int err = 0, sig = ksig->sig; 920 int err = 0, sig = ksig->sig;
927 921
928 if (fsize < 0) { 922 if (fsize < 0) {
929#ifdef DEBUG 923 pr_debug("setup_frame: Unknown frame format %#x\n",
930 printk ("setup_frame: Unknown frame format %#x\n", 924 regs->format);
931 regs->format);
932#endif
933 return -EFAULT; 925 return -EFAULT;
934 } 926 }
935 927
@@ -993,9 +985,7 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
993 if (regs->stkadj) { 985 if (regs->stkadj) {
994 struct pt_regs *tregs = 986 struct pt_regs *tregs =
995 (struct pt_regs *)((ulong)regs + regs->stkadj); 987 (struct pt_regs *)((ulong)regs + regs->stkadj);
996#ifdef DEBUG 988 pr_debug("Performing stackadjust=%04lx\n", regs->stkadj);
997 printk("Performing stackadjust=%04x\n", regs->stkadj);
998#endif
999 /* This must be copied with decreasing addresses to 989 /* This must be copied with decreasing addresses to
1000 handle overlaps. */ 990 handle overlaps. */
1001 tregs->vector = 0; 991 tregs->vector = 0;
diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c
index b3536a82a262..b29c3b241e1b 100644
--- a/arch/m68k/kernel/uboot.c
+++ b/arch/m68k/kernel/uboot.c
@@ -83,8 +83,7 @@ static void __init parse_uboot_commandline(char *commandp, int size)
83 initrd_start = uboot_initrd_start; 83 initrd_start = uboot_initrd_start;
84 initrd_end = uboot_initrd_end; 84 initrd_end = uboot_initrd_end;
85 ROOT_DEV = Root_RAM0; 85 ROOT_DEV = Root_RAM0;
86 printk(KERN_INFO "initrd at 0x%lx:0x%lx\n", 86 pr_info("initrd at 0x%lx:0x%lx\n", initrd_start, initrd_end);
87 initrd_start, initrd_end);
88 } 87 }
89#endif /* if defined(CONFIG_BLK_DEV_INITRD) */ 88#endif /* if defined(CONFIG_BLK_DEV_INITRD) */
90} 89}
generated by cgit v1.2.2 (git 2.25.0) at 2025-05-31 08:51:14 -0400