Re: [PATCHes available] printk() without KERN_ prefixes? (in 2.5.59) (again)

Re: [PATCHes available] printk() without KERN_ prefixes? (in 2.5.59) (again)

[Ph. Marek]

[-- Attachment #1: Type: text/plain, Size: 3835 bytes --]

Hello David!

> If you send me the summary for the ia64-specific files, I'll take a look at
> fixing them (well, perhaps not all of them right away; might be a lot of
> work).
>
> 	--david
I've let my script run through the arch/ia64-directory; it had problems parsing the files
	./arch/ia64/sn/io/sn1/pcibr.c in pcibr_slot_info_init
and
	./arch/ia64/sn/io/sn2/pcibr/pcibr_error.c in pcibr_pioerror
because of this constructs:
	#ifdef LITTLE_ENDIAN
                           (wptr[(((win + 1)*4)^4)/4] != 0)) {
	#else
                           (wptr[win + 1] != 0)) {
	#endif /* LITTLE_ENDIAN */
(the braces { and } don't add up in the file).


I have to admit that I didn't look at 
every single line of this patch; but I believe in my script :-)


Attached is a patch, and below is the diffstat.

Thank you!


Regards,

Phil



diffstat printk_arch_ia64.patch
 dig/setup.c                   |    2 -
 hp/common/sba_iommu.c         |   10 +++---
 hp/sim/simeth.c               |   18 +++++------
 hp/sim/simscsi.c              |    8 ++---
 hp/sim/simserial.c            |   46 ++++++++++++++---------------
 ia32/ia32_ioctl.c             |    2 -
 kernel/acpi.c                 |   22 +++++++-------
 kernel/brl_emu.c              |    2 -
 kernel/efi.c                  |   14 ++++----
 kernel/iosapic.c              |   16 +++++-----
 kernel/irq.c                  |    8 ++---
 kernel/irq_ia64.c             |    2 -
 kernel/machvec.c              |    2 -
 kernel/mca.c                  |   16 +++++-----
 kernel/palinfo.c              |   18 +++++------
 kernel/perfmon.c              |   48 +++++++++++++++---------------
 kernel/perfmon_mckinley.h     |    2 -
 kernel/process.c              |   36 +++++++++++-----------
 kernel/sal.c                  |    6 +--
 kernel/setup.c                |    8 ++---
 kernel/smpboot.c              |   16 +++++-----
 kernel/time.c                 |   12 +++----
 kernel/traps.c                |    6 +--
 kernel/unaligned.c            |    2 -
 kernel/unwind.c               |   14 ++++----
 lib/swiotlb.c                 |    2 -
 mm/discontig.c                |    2 -
 mm/fault.c                    |    2 -
 mm/init.c                     |   34 ++++++++++-----------
 sn/io/ate_utils.c             |    2 -
 sn/io/cdl.c                   |    2 -
 sn/io/eeprom.c                |    6 +--
 sn/io/hcl.c                   |   14 ++++----
 sn/io/hubspc.c                |    2 -
 sn/io/ifconfig_net.c          |    6 +--
 sn/io/io.c                    |   10 +++---
 sn/io/klgraph_hack.c          |   14 ++++----
 sn/io/l1.c                    |    2 -
 sn/io/pci_bus_cvlink.c        |   60 +++++++++++++++++++-------------------
 sn/io/pciba.c                 |   12 +++----
 sn/io/pciio.c                 |    6 +--
 sn/io/sgi_if.c                |    2 -
 sn/io/sn1/hubcounters.c       |    6 +--
 sn/io/sn1/huberror.c          |    2 -
 sn/io/sn1/ml_SN_intr.c        |    2 -
 sn/io/sn1/pcibr.c             |   24 +++++++--------
 sn/io/sn2/ml_SN_intr.c        |    4 +-
 sn/io/sn2/pcibr/pcibr_ate.c   |    2 -
 sn/io/sn2/pcibr/pcibr_dvr.c   |    6 +--
 sn/io/sn2/pcibr/pcibr_error.c |   40 ++++++++++++-------------
 sn/io/sn2/pcibr/pcibr_intr.c  |    4 +-
 sn/io/sn2/shub_intr.c         |    2 -
 sn/io/sn2/shuberror.c         |    6 +--
 sn/io/xbow.c                  |   10 +++---
 sn/kernel/irq.c               |    2 -
 sn/kernel/llsc4.c             |   58 ++++++++++++++++++------------------
 sn/kernel/misctest.c          |   56 +++++++++++++++++------------------
 sn/kernel/setup.c             |    2 -
 sn/kernel/sn1/error.c         |    2 -
 sn/kernel/sn1/sn1_smp.c       |    2 -
 sn/kernel/sn1/synergy.c       |   12 +++----
 sn/kernel/sv.c                |   66 +++++++++++++++++++++---------------------
 63 files changed, 411 insertions(+), 411 deletions(-)



[-- Attachment #2: printk_arch_ia64.patch.bz2 --]
[-- Type: application/x-bzip2, Size: 26007 bytes --]

Re: [PATCHes available] printk() without KERN_ prefixes? (in 2.5.59) (again)

[Ph. Marek]

> > 	#ifdef LITTLE_ENDIAN
> >                            (wptr[(((win + 1)*4)^4)/4] != 0)) {
> > 	#else
> >                            (wptr[win + 1] != 0)) {
> > 	#endif /* LITTLE_ENDIAN */
> > (the braces { and } don't add up in the file).
>
> they do, but your script doesn't use c preprocessor with right flags,
> which it probably should.
>
> The two braces above should be counted as one depending on LITTLE_ENDIAN
> defined.
# wc change_printk.pl
    141     268    2361 change_printk.pl
I don't use the preprocessor - after all, which -D should I give? all? none? a 
part? So my script just reads the files.

I know that my script could parse the #if's also - but that's a lot of work 
with little use.

How about that?

	#if defined(FORCE_ERRORS)
	        if (0) {
	#elif !DEBUG
	        if (kdebug) {
	#endif
	...
	#if !DEBUG || defined(FORCE_ERRORS)
	        }
	#endif
(seen in arch/ia64/sn/io/sn2/pcibr/pcibr_error.c: pcibr_pioerror() )

It's just too complex to look on the #if's and gives not enough advantages.


Regards,

Phil

Re: [PATCHes available] printk() without KERN_ prefixes? (in 2.5.59) (again)

[Ph. Marek]

> OK, I went through the ia64-specific files that you identified and
> fixed up the printk()s.  Note that I do not maintain the files in
> the "sn" subdirectories---those are SGI-specific and are maintained
> by:
>
> +SN-IA64 (Itanium) SUB-PLATFORM
> +P:	Jesse Barnes
> +M:	jbarnes@sgi.com
> +L:	linux-ia64@linuxia64.org
> +W:	http://www.sgi.com/altix
> +S:	Maintained
>
> Thanks for the good work!
Thank you!



Regards,

Phil