← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise-security

« back to all changes in this revision

Viewing changes to arch/powerpc/include/asm/bitops.h

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati
  • Date: 2011-12-06 15:56:07 UTC
  • Revision ID: package-import@ubuntu.com-20111206155607-pcf44kv5fmhk564f
Tags: 3.2.0-1401.1
[ Paolo Pisati ]

* Rebased on top of Ubuntu-3.2.0-3.8
* Tilt-tracking @ ef2487af4bb15bdd0689631774b5a5e3a59f74e2
* Delete debian.ti-omap4/control, it shoudln't be tracked
* Fix architecture spelling (s/armel/armhf/)
* [Config] Update configs following 3.2 import
* [Config] Fix compilation: disable CODA and ARCH_OMAP3
* [Config] Fix compilation: disable Ethernet Faraday
* Update series to precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/powerpc/include/asm/bitops.h
124
124
        return (old & mask);                            \
125
125
}
126
126
 
127
 
DEFINE_TESTOP(test_and_set_bits, or, PPC_RELEASE_BARRIER,
128
 
              PPC_ACQUIRE_BARRIER, 0)
 
127
DEFINE_TESTOP(test_and_set_bits, or, PPC_ATOMIC_ENTRY_BARRIER,
 
128
              PPC_ATOMIC_EXIT_BARRIER, 0)
129
129
DEFINE_TESTOP(test_and_set_bits_lock, or, "",
130
130
              PPC_ACQUIRE_BARRIER, 1)
131
 
DEFINE_TESTOP(test_and_clear_bits, andc, PPC_RELEASE_BARRIER,
132
 
              PPC_ACQUIRE_BARRIER, 0)
133
 
DEFINE_TESTOP(test_and_change_bits, xor, PPC_RELEASE_BARRIER,
134
 
              PPC_ACQUIRE_BARRIER, 0)
 
131
DEFINE_TESTOP(test_and_clear_bits, andc, PPC_ATOMIC_ENTRY_BARRIER,
 
132
              PPC_ATOMIC_EXIT_BARRIER, 0)
 
133
DEFINE_TESTOP(test_and_change_bits, xor, PPC_ATOMIC_ENTRY_BARRIER,
 
134
              PPC_ATOMIC_EXIT_BARRIER, 0)
135
135
 
136
136
static __inline__ int test_and_set_bit(unsigned long nr,
137
137
                                       volatile unsigned long *addr)
327
327
                                    unsigned long size, unsigned long offset);
328
328
/* Bitmap functions for the ext2 filesystem */
329
329
 
330
 
#define ext2_set_bit_atomic(lock, nr, addr) \
331
 
        test_and_set_bit_le((nr), (unsigned long*)addr)
332
 
#define ext2_clear_bit_atomic(lock, nr, addr) \
333
 
        test_and_clear_bit_le((nr), (unsigned long*)addr)
 
330
#include <asm-generic/bitops/ext2-atomic-setbit.h>
334
331
 
335
332
#include <asm-generic/bitops/sched.h>
336
333