Re: [PATCH v2] ARM: fix vdsomunge not to depend on glibc specific byteswap.h

From	Nathan Lynch <Nathan_Lynch@mentor.com>
Newsgroups	linux.kernel
Subject	Re: [PATCH v2] ARM: fix vdsomunge not to depend on glibc specific byteswap.h
Date	2015-10-14 16:20 +0200
Message-ID	<qjv4m-Wf-7@gated-at.bofh.it> (permalink)
References	<qerXs-14n-13@gated-at.bofh.it> <qfBUJ-4pO-1@gated-at.bofh.it> <qjtFf-7cv-11@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On 10/14/2015 07:47 AM, H. Nikolaus Schaller wrote:
>> diff --git a/arch/arm/vdso/vdsomunge.c b/arch/arm/vdso/vdsomunge.c
>> index aedec81..27a9a0b 100644
>> --- a/arch/arm/vdso/vdsomunge.c
>> +++ b/arch/arm/vdso/vdsomunge.c
>> @@ -45,7 +45,18 @@
>> * it does.
>> */
>>
>> -#include <byteswap.h>
>> +#define swab16(x) \
>> +	((unsigned short)( \
>> +		(((unsigned short)(x) & (unsigned short)0x00ffU) << 8) | \
>> +		(((unsigned short)(x) & (unsigned short)0xff00U) >> 8) ))
>> +
>> +#define swab32(x) \
>> +	((unsigned int)( \
>> +		(((unsigned int)(x) & (unsigned int)0x000000ffUL) << 24) | \
>> +		(((unsigned int)(x) & (unsigned int)0x0000ff00UL) <<  8) | \
>> +		(((unsigned int)(x) & (unsigned int)0x00ff0000UL) >>  8) | \
>> +		(((unsigned int)(x) & (unsigned int)0xff000000UL) >> 24) ))
>> +
>> #include <elf.h>
>> #include <errno.h>
>> #include <fcntl.h>
>> @@ -104,17 +115,17 @@ static void cleanup(void)
>>
>> static Elf32_Word read_elf_word(Elf32_Word word, bool swap)
>> {
>> -	return swap ? bswap_32(word) : word;
>> +	return swap ? swab32(word) : word;
>> }
>>
>> static Elf32_Half read_elf_half(Elf32_Half half, bool swap)
>> {
>> -	return swap ? bswap_16(half) : half;
>> +	return swap ? swab16(half) : half;
>> }
>>
>> static void write_elf_word(Elf32_Word val, Elf32_Word *dst, bool swap)
>> {
>> -	*dst = swap ? bswap_32(val) : val;
>> +	*dst = swap ? swab32(val) : val;
>> }
> ping.

Sorry for the delay.

This is okay but I'd prefer the swab macros to be below the #include
lines, and it would be easier for me to deal with a patch that isn't
whitespace-damaged.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Thread

Re: [PATCH v2] ARM: fix vdsomunge not to depend on glibc specific byteswap.h "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-10-14 14:50 +0200
  Re: [PATCH v2] ARM: fix vdsomunge not to depend on glibc specific  byteswap.h Nathan Lynch <Nathan_Lynch@mentor.com> - 2015-10-14 16:20 +0200
    Re: [PATCH v2] ARM: fix vdsomunge not to depend on glibc specific byteswap.h "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-10-15 08:00 +0200
      Re: [PATCH v2] ARM: fix vdsomunge not to depend on glibc specific  byteswap.h Russell King - ARM Linux <linux@arm.linux.org.uk> - 2015-10-15 18:40 +0200
        Re: [PATCH v2] ARM: fix vdsomunge not to depend on glibc specific byteswap.h "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-10-15 19:00 +0200
      Re: [PATCH v2] ARM: fix vdsomunge not to depend on glibc specific  byteswap.h Nathan Lynch <Nathan_Lynch@mentor.com> - 2015-10-15 19:10 +0200
        Re: [PATCH v2] ARM: fix vdsomunge not to depend on glibc specific byteswap.h "H. Nikolaus Schaller" <hns@goldelico.com> - 2015-10-15 19:20 +0200
          Re: [PATCH v2] ARM: fix vdsomunge not to depend on glibc specific  byteswap.h Nathan Lynch <Nathan_Lynch@mentor.com> - 2015-10-15 19:30 +0200

csiph-web