Merge tag 'printk-for-6.6-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux

torvalds · torvalds · commit 01a46efcd8f4 · 2023-09-08T12:13:01.000-07:00
Pull printk fix from Petr Mladek:

 - Revert exporting symbols needed for dumping the raw printk buffer in
   panic().

   I pushed the export prematurely before the user was ready for merging
   into the mainline.

* tag 'printk-for-6.6-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
  Revert "printk: export symbols for debug modules"
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
@@ -538,14 +538,12 @@ char *log_buf_addr_get(void)
 {
 	return log_buf;
 }
-EXPORT_SYMBOL_GPL(log_buf_addr_get);
 
 /* Return log buffer size */
 u32 log_buf_len_get(void)
 {
 	return log_buf_len;
 }
-EXPORT_SYMBOL_GPL(log_buf_len_get);
 
 /*
  * Define how much of the log buffer we could take at maximum. The value

Original file line number	Diff line number	Diff line change
`@@ -538,14 +538,12 @@ char *log_buf_addr_get(void)`
`538`	`538`	`{`
`539`	`539`	`return log_buf;`
`540`	`540`	`}`
`541`		`-EXPORT_SYMBOL_GPL(log_buf_addr_get);`
`542`	`541`
`543`	`542`	`/* Return log buffer size */`
`544`	`543`	`u32 log_buf_len_get(void)`
`545`	`544`	`{`
`546`	`545`	`return log_buf_len;`
`547`	`546`	`}`
`548`		`-EXPORT_SYMBOL_GPL(log_buf_len_get);`
`549`	`547`
`550`	`548`	`/*`
`551`	`549`	`* Define how much of the log buffer we could take at maximum. The value`