Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 335689
b: refs/heads/master
c: d38e0e3
h: refs/heads/master
i:
  335687: 21f144c
v: v3
  • Loading branch information
Colin Cross authored and Greg Kroah-Hartman committed Nov 13, 2012
1 parent 71e78be commit 00d3cc5
Show file tree
Hide file tree
Showing 77 changed files with 602 additions and 1,621 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 62735e5231e2de4c491c7cd52f83ce0fe64b4c36
refs/heads/master: d38e0e3fed4f58bcddef4dc93a591dfe2f651cb0
60 changes: 9 additions & 51 deletions trunk/MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3598,58 +3598,16 @@ F: drivers/hid/hid-hyperv.c
F: drivers/net/hyperv/
F: drivers/staging/hv/

I2C OVER PARALLEL PORT
M: Jean Delvare <khali@linux-fr.org>
L: linux-i2c@vger.kernel.org
S: Maintained
F: Documentation/i2c/busses/i2c-parport
F: Documentation/i2c/busses/i2c-parport-light
F: drivers/i2c/busses/i2c-parport.c
F: drivers/i2c/busses/i2c-parport-light.c

I2C/SMBUS CONTROLLER DRIVERS FOR PC
M: Jean Delvare <khali@linux-fr.org>
L: linux-i2c@vger.kernel.org
S: Maintained
F: Documentation/i2c/busses/i2c-ali1535
F: Documentation/i2c/busses/i2c-ali1563
F: Documentation/i2c/busses/i2c-ali15x3
F: Documentation/i2c/busses/i2c-amd756
F: Documentation/i2c/busses/i2c-amd8111
F: Documentation/i2c/busses/i2c-i801
F: Documentation/i2c/busses/i2c-nforce2
F: Documentation/i2c/busses/i2c-piix4
F: Documentation/i2c/busses/i2c-sis5595
F: Documentation/i2c/busses/i2c-sis630
F: Documentation/i2c/busses/i2c-sis96x
F: Documentation/i2c/busses/i2c-via
F: Documentation/i2c/busses/i2c-viapro
F: drivers/i2c/busses/i2c-ali1535.c
F: drivers/i2c/busses/i2c-ali1563.c
F: drivers/i2c/busses/i2c-ali15x3.c
F: drivers/i2c/busses/i2c-amd756.c
F: drivers/i2c/busses/i2c-amd756-s4882.c
F: drivers/i2c/busses/i2c-amd8111.c
F: drivers/i2c/busses/i2c-i801.c
F: drivers/i2c/busses/i2c-isch.c
F: drivers/i2c/busses/i2c-nforce2.c
F: drivers/i2c/busses/i2c-nforce2-s4985.c
F: drivers/i2c/busses/i2c-piix4.c
F: drivers/i2c/busses/i2c-sis5595.c
F: drivers/i2c/busses/i2c-sis630.c
F: drivers/i2c/busses/i2c-sis96x.c
F: drivers/i2c/busses/i2c-via.c
F: drivers/i2c/busses/i2c-viapro.c

I2C/SMBUS STUB DRIVER
M: "Mark M. Hoffman" <mhoffman@lightlink.com>
L: linux-i2c@vger.kernel.org
S: Maintained
F: drivers/i2c/busses/i2c-stub.c

I2C SUBSYSTEM
M: Wolfram Sang <w.sang@pengutronix.de>
M: "Jean Delvare (PC drivers, core)" <khali@linux-fr.org>
M: "Ben Dooks (embedded platforms)" <ben-linux@fluff.org>
M: "Wolfram Sang (embedded platforms)" <w.sang@pengutronix.de>
L: linux-i2c@vger.kernel.org
W: http://i2c.wiki.kernel.org/
T: quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
Expand All @@ -3660,13 +3618,6 @@ F: drivers/i2c/
F: include/linux/i2c.h
F: include/linux/i2c-*.h

I2C-TAOS-EVM DRIVER
M: Jean Delvare <khali@linux-fr.org>
L: linux-i2c@vger.kernel.org
S: Maintained
F: Documentation/i2c/busses/i2c-taos-evm
F: drivers/i2c/busses/i2c-taos-evm.c

I2C-TINY-USB DRIVER
M: Till Harbaum <till@harbaum.org>
L: linux-i2c@vger.kernel.org
Expand Down Expand Up @@ -7936,6 +7887,13 @@ M: Roger Luethi <rl@hellgate.ch>
S: Maintained
F: drivers/net/ethernet/via/via-rhine.c

VIAPRO SMBUS DRIVER
M: Jean Delvare <khali@linux-fr.org>
L: linux-i2c@vger.kernel.org
S: Maintained
F: Documentation/i2c/busses/i2c-viapro
F: drivers/i2c/busses/i2c-viapro.c

VIA SD/MMC CARD CONTROLLER DRIVER
M: Bruce Chang <brucechang@via.com.tw>
M: Harald Welte <HaraldWelte@viatech.com>
Expand Down
1 change: 0 additions & 1 deletion trunk/arch/mips/cavium-octeon/executive/cvmx-l2c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
* measurement, and debugging facilities.
*/

#include <linux/irqflags.h>
#include <asm/octeon/cvmx.h>
#include <asm/octeon/cvmx-l2c.h>
#include <asm/octeon/cvmx-spinlock.h>
Expand Down
128 changes: 89 additions & 39 deletions trunk/arch/mips/include/asm/bitops.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#endif

#include <linux/compiler.h>
#include <linux/irqflags.h>
#include <linux/types.h>
#include <asm/barrier.h>
#include <asm/byteorder.h> /* sigh ... */
Expand Down Expand Up @@ -43,24 +44,6 @@
#define smp_mb__before_clear_bit() smp_mb__before_llsc()
#define smp_mb__after_clear_bit() smp_llsc_mb()


/*
* These are the "slower" versions of the functions and are in bitops.c.
* These functions call raw_local_irq_{save,restore}().
*/
void __mips_set_bit(unsigned long nr, volatile unsigned long *addr);
void __mips_clear_bit(unsigned long nr, volatile unsigned long *addr);
void __mips_change_bit(unsigned long nr, volatile unsigned long *addr);
int __mips_test_and_set_bit(unsigned long nr,
volatile unsigned long *addr);
int __mips_test_and_set_bit_lock(unsigned long nr,
volatile unsigned long *addr);
int __mips_test_and_clear_bit(unsigned long nr,
volatile unsigned long *addr);
int __mips_test_and_change_bit(unsigned long nr,
volatile unsigned long *addr);


/*
* set_bit - Atomically set a bit in memory
* @nr: the bit to set
Expand All @@ -74,7 +57,7 @@ int __mips_test_and_change_bit(unsigned long nr,
static inline void set_bit(unsigned long nr, volatile unsigned long *addr)
{
unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);
int bit = nr & SZLONG_MASK;
unsigned short bit = nr & SZLONG_MASK;
unsigned long temp;

if (kernel_uses_llsc && R10000_LLSC_WAR) {
Expand Down Expand Up @@ -109,8 +92,17 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *addr)
: "=&r" (temp), "+m" (*m)
: "ir" (1UL << bit));
} while (unlikely(!temp));
} else
__mips_set_bit(nr, addr);
} else {
volatile unsigned long *a = addr;
unsigned long mask;
unsigned long flags;

a += nr >> SZLONG_LOG;
mask = 1UL << bit;
raw_local_irq_save(flags);
*a |= mask;
raw_local_irq_restore(flags);
}
}

/*
Expand All @@ -126,7 +118,7 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *addr)
static inline void clear_bit(unsigned long nr, volatile unsigned long *addr)
{
unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);
int bit = nr & SZLONG_MASK;
unsigned short bit = nr & SZLONG_MASK;
unsigned long temp;

if (kernel_uses_llsc && R10000_LLSC_WAR) {
Expand Down Expand Up @@ -161,8 +153,17 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *addr)
: "=&r" (temp), "+m" (*m)
: "ir" (~(1UL << bit)));
} while (unlikely(!temp));
} else
__mips_clear_bit(nr, addr);
} else {
volatile unsigned long *a = addr;
unsigned long mask;
unsigned long flags;

a += nr >> SZLONG_LOG;
mask = 1UL << bit;
raw_local_irq_save(flags);
*a &= ~mask;
raw_local_irq_restore(flags);
}
}

/*
Expand Down Expand Up @@ -190,7 +191,7 @@ static inline void clear_bit_unlock(unsigned long nr, volatile unsigned long *ad
*/
static inline void change_bit(unsigned long nr, volatile unsigned long *addr)
{
int bit = nr & SZLONG_MASK;
unsigned short bit = nr & SZLONG_MASK;

if (kernel_uses_llsc && R10000_LLSC_WAR) {
unsigned long *m = ((unsigned long *) addr) + (nr >> SZLONG_LOG);
Expand Down Expand Up @@ -219,8 +220,17 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr)
: "=&r" (temp), "+m" (*m)
: "ir" (1UL << bit));
} while (unlikely(!temp));
} else
__mips_change_bit(nr, addr);
} else {
volatile unsigned long *a = addr;
unsigned long mask;
unsigned long flags;

a += nr >> SZLONG_LOG;
mask = 1UL << bit;
raw_local_irq_save(flags);
*a ^= mask;
raw_local_irq_restore(flags);
}
}

/*
Expand All @@ -234,7 +244,7 @@ static inline void change_bit(unsigned long nr, volatile unsigned long *addr)
static inline int test_and_set_bit(unsigned long nr,
volatile unsigned long *addr)
{
int bit = nr & SZLONG_MASK;
unsigned short bit = nr & SZLONG_MASK;
unsigned long res;

smp_mb__before_llsc();
Expand Down Expand Up @@ -271,8 +281,18 @@ static inline int test_and_set_bit(unsigned long nr,
} while (unlikely(!res));

res = temp & (1UL << bit);
} else
res = __mips_test_and_set_bit(nr, addr);
} else {
volatile unsigned long *a = addr;
unsigned long mask;
unsigned long flags;

a += nr >> SZLONG_LOG;
mask = 1UL << bit;
raw_local_irq_save(flags);
res = (mask & *a);
*a |= mask;
raw_local_irq_restore(flags);
}

smp_llsc_mb();

Expand All @@ -290,7 +310,7 @@ static inline int test_and_set_bit(unsigned long nr,
static inline int test_and_set_bit_lock(unsigned long nr,
volatile unsigned long *addr)
{
int bit = nr & SZLONG_MASK;
unsigned short bit = nr & SZLONG_MASK;
unsigned long res;

if (kernel_uses_llsc && R10000_LLSC_WAR) {
Expand Down Expand Up @@ -325,8 +345,18 @@ static inline int test_and_set_bit_lock(unsigned long nr,
} while (unlikely(!res));

res = temp & (1UL << bit);
} else
res = __mips_test_and_set_bit_lock(nr, addr);
} else {
volatile unsigned long *a = addr;
unsigned long mask;
unsigned long flags;

a += nr >> SZLONG_LOG;
mask = 1UL << bit;
raw_local_irq_save(flags);
res = (mask & *a);
*a |= mask;
raw_local_irq_restore(flags);
}

smp_llsc_mb();

Expand All @@ -343,7 +373,7 @@ static inline int test_and_set_bit_lock(unsigned long nr,
static inline int test_and_clear_bit(unsigned long nr,
volatile unsigned long *addr)
{
int bit = nr & SZLONG_MASK;
unsigned short bit = nr & SZLONG_MASK;
unsigned long res;

smp_mb__before_llsc();
Expand Down Expand Up @@ -398,8 +428,18 @@ static inline int test_and_clear_bit(unsigned long nr,
} while (unlikely(!res));

res = temp & (1UL << bit);
} else
res = __mips_test_and_clear_bit(nr, addr);
} else {
volatile unsigned long *a = addr;
unsigned long mask;
unsigned long flags;

a += nr >> SZLONG_LOG;
mask = 1UL << bit;
raw_local_irq_save(flags);
res = (mask & *a);
*a &= ~mask;
raw_local_irq_restore(flags);
}

smp_llsc_mb();

Expand All @@ -417,7 +457,7 @@ static inline int test_and_clear_bit(unsigned long nr,
static inline int test_and_change_bit(unsigned long nr,
volatile unsigned long *addr)
{
int bit = nr & SZLONG_MASK;
unsigned short bit = nr & SZLONG_MASK;
unsigned long res;

smp_mb__before_llsc();
Expand Down Expand Up @@ -454,8 +494,18 @@ static inline int test_and_change_bit(unsigned long nr,
} while (unlikely(!res));

res = temp & (1UL << bit);
} else
res = __mips_test_and_change_bit(nr, addr);
} else {
volatile unsigned long *a = addr;
unsigned long mask;
unsigned long flags;

a += nr >> SZLONG_LOG;
mask = 1UL << bit;
raw_local_irq_save(flags);
res = (mask & *a);
*a ^= mask;
raw_local_irq_restore(flags);
}

smp_llsc_mb();

Expand Down
2 changes: 1 addition & 1 deletion trunk/arch/mips/include/asm/compat.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ struct compat_shmid64_ds {

static inline int is_compat_task(void)
{
return test_thread_flag(TIF_32BIT_ADDR);
return test_thread_flag(TIF_32BIT);
}

#endif /* _ASM_COMPAT_H */
1 change: 0 additions & 1 deletion trunk/arch/mips/include/asm/io.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <linux/compiler.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/irqflags.h>

#include <asm/addrspace.h>
#include <asm/bug.h>
Expand Down
Loading

0 comments on commit 00d3cc5

Please sign in to comment.