linux-kernel - linux-next: manual merge of the pci tree with the asm-generic tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20140926132902.603fb9f8@canb.auug.org.au>
Date:	Fri, 26 Sep 2014 13:29:02 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Bjorn Helgaas <bhelgaas@...gle.com>, Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Thierry Reding <treding@...dia.com>,
	Liviu Dudau <Liviu.Dudau@....com>
Subject: linux-next: manual merge of the pci tree with the asm-generic tree

Hi Bjorn,

Today's linux-next merge of the pci tree got a conflict in
include/asm-generic/io.h between commit 4005bfe0aa45
("asm-generic/io.h: Implement generic {read,write}s*()") from the
asm-generic tree and commit 3aad9c969c09 ("asm-generic/io.h: Fix
ioport_map() for !CONFIG_GENERIC_IOMAP") from the pci tree.

I fixed it up (the only difference is that the latter castes the result
to void __iomem * - see below) and can carry the fix as necessary (no
action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/asm-generic/io.h
index 3e976be3bdd4,2e2161b0c795..000000000000
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@@ -756,16 -329,11 +756,16 @@@ static inline void iounmap(void __iome
  
  #ifdef CONFIG_HAS_IOPORT_MAP
  #ifndef CONFIG_GENERIC_IOMAP
 +#ifndef ioport_map
 +#define ioport_map ioport_map
  static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
  {
- 	return PCI_IOBASE + (port & IO_SPACE_LIMIT);
+ 	return (void __iomem *)(PCI_IOBASE + (port & IO_SPACE_LIMIT));
  }
 +#endif
  
 +#ifndef ioport_unmap
 +#define ioport_unmap ioport_unmap
  static inline void ioport_unmap(void __iomem *p)
  {
  }

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)