| author | Hauke Mehrtens <hauke@hauke-m.de> | |
| Sun, 18 Aug 2013 23:38:04 +0000 (01:38 +0200) | ||
| committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | |
| Tue, 27 Aug 2013 18:43:04 +0000 (11:43 -0700) | ||
| commit | 5bb729709380c458fd530901b2978be4f635d35d | |
| tree | db3ecd9d8cdab67d0470ab359557abdfdfad9717 | tree | snapshot (tar.xz tar.gz zip) |
| parent | d1e6a65bed09e5f5da9ba4069210570694edd5df | commit | diff |
backports: fix conflict in swiotlb_nr_tbl() on RHEL 6.4
The RedHat kernel also provides a implementation for swiotlb_nr_tbl(),
us that one on these kernels.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
The RedHat kernel also provides a implementation for swiotlb_nr_tbl(),
us that one on these kernels.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
| backport/backport-include/linux/swiotlb.h | diff | blob | history |