From 470757cf154e954ab41261b8d75fcdc6db02364d Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Tue, 14 Jun 2016 16:28:36 +0200 Subject: [PATCH] lxip: implement ffz() with __ffs() Unfortunately, ffs() returns bit positions starting at 1 while ffz() needs the semantics of __ffs(), which starts bit positions at zero. --- repos/dde_linux/src/lib/lxip/dummies.cc | 15 --------------- repos/dde_linux/src/lib/lxip/include/lx_emul.h | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/repos/dde_linux/src/lib/lxip/dummies.cc b/repos/dde_linux/src/lib/lxip/dummies.cc index dcd3ecc25d..5e520a3aaa 100644 --- a/repos/dde_linux/src/lib/lxip/dummies.cc +++ b/repos/dde_linux/src/lib/lxip/dummies.cc @@ -228,7 +228,6 @@ DUMMY(-1, dump_stack) DUMMY(-1, ether_addr_equal_64bits) DUMMY(-1, exit_fn) DUMMY(-1, file_inode) -DUMMY(-1, fls64) DUMMY(-1, free_pages) DUMMY(-1, from_kgid) DUMMY(-1, from_kgid_munged) @@ -304,13 +303,8 @@ DUMMY(-1, ip_mc_up) DUMMY(-1, ip_mroute_getsockopt) DUMMY(-1, ip_mroute_opt) DUMMY(-1, ip_mroute_setsockopt) -DUMMY(-1, ipv4_is_lbcast) DUMMY(-1, ipv4_is_local_multicast) -DUMMY(-1, ipv4_is_zeronet) DUMMY(-1, irqs_disabled) -DUMMY(-1, is_a_nulls) -DUMMY(-1, is_multicast_ether_addr) -DUMMY(-1, is_valid_ether_addr) DUMMY(-1, is_vlan_dev) DUMMY(-1, kernel_sendmsg) DUMMY(-1, kmem_cache_destroy) @@ -329,8 +323,6 @@ DUMMY(-1, linkwatch_fire_event) DUMMY(-1, linkwatch_forget_dev) DUMMY(-1, linkwatch_init_dev) DUMMY(-1, linkwatch_run_queue) -DUMMY(-1, list_del_rcu) -DUMMY(-1, list_replace_rcu) DUMMY(-1, local_softirq_pending) DUMMY(-1, lockdep_rtnl_is_held) DUMMY(-1, min) @@ -404,7 +396,6 @@ DUMMY(-1, request_module) DUMMY(-1, round_jiffies) DUMMY(-1, round_jiffies_relative) DUMMY(-1, round_jiffies_up) -DUMMY(-1, roundup_pow_of_two) DUMMY(-1, rt_genid_bump) DUMMY(-1, rtnetlink_init) DUMMY(-1, __rtnl_unlock) @@ -486,9 +477,6 @@ DUMMY(-1, tcp_peer_is_proven) DUMMY(-1, tcp_remember_stamp) DUMMY(-1, tcp_tw_remember_stamp) DUMMY(-1, tcp_update_metrics) -DUMMY(-1, test_and_clear_bit) -DUMMY(-1, test_and_set_bit) -DUMMY(-1, test_bit) DUMMY(-1, textsearch_find) DUMMY(-1, __this_cpu_read) DUMMY_SKIP(-1, trace_napi_poll) @@ -517,7 +505,6 @@ DUMMY(-1, wake_up_interruptible_sync_poll) DUMMY(-1, WARN_ONCE) DUMMY(-1, write_seqcount_begin) DUMMY(-1, write_seqcount_end) -DUMMY(-1, xchg) DUMMY(-1, xfrm4_policy_check_reverse) DUMMY(-1, xfrm4_route_forward) DUMMY(-1, xfrm4_udp_encap_rcv) @@ -546,8 +533,6 @@ DUMMY_STOP(0, copy_from_iter_nocache) DUMMY(0, csum_ipv6_magic) DUMMY(0, csum_replace4) DUMMY(0, file_ns_capable) -DUMMY(0, find_first_bit) -DUMMY(0, find_next_bit) DUMMY(0, flow_keys_buf_dissector) DUMMY(0, fnhe_genid) DUMMY(0, gfpflags_allow_blocking) diff --git a/repos/dde_linux/src/lib/lxip/include/lx_emul.h b/repos/dde_linux/src/lib/lxip/include/lx_emul.h index d525ac42f5..30f1231f19 100644 --- a/repos/dde_linux/src/lib/lxip/include/lx_emul.h +++ b/repos/dde_linux/src/lib/lxip/include/lx_emul.h @@ -80,7 +80,7 @@ typedef __u32 __wsum; #include -#define ffz(x) ffs(~(x)) +#define ffz(x) __ffs(~(x)) /******************************* ** asm-generic/bitops/find.h **