hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4875/1: Add MODULE_ALIAS to ixp4xx-beeper module
  [ARM] 4873/1: Fix ITE 8152 interrupt demux
  [ARM] 4878/1: Add oabi shim for fstatat64
This commit is contained in:
Linus Torvalds 2008-04-01 11:26:26 -07:00
parent 1f4cfbaa2b 1035d60d92
commit d5f1a21ca0
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/common/it8152.c
View File

@ -120,6 +120,7 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
time, when they all three were 0. */ time, when they all three were 0. */
bits_pd = __raw_readl(IT8152_INTC_PDCNIRR); bits_pd = __raw_readl(IT8152_INTC_PDCNIRR);
bits_lp = __raw_readl(IT8152_INTC_LPCNIRR); bits_lp = __raw_readl(IT8152_INTC_LPCNIRR);
bits_ld = __raw_readl(IT8152_INTC_LDCNIRR);
if (!(bits_ld | bits_lp | bits_pd)) if (!(bits_ld | bits_lp | bits_pd))
return; return;
} }
@ -133,14 +134,14 @@ void it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
bits_lp &= ((1 << IT8152_LP_IRQ_COUNT) - 1); bits_lp &= ((1 << IT8152_LP_IRQ_COUNT) - 1);
while (bits_lp) { while (bits_lp) {
i = __ffs(bits_pd); i = __ffs(bits_lp);
it8152_irq(IT8152_LP_IRQ(i)); it8152_irq(IT8152_LP_IRQ(i));
bits_lp &= ~(1 << i); bits_lp &= ~(1 << i);
} }
bits_ld &= ((1 << IT8152_LD_IRQ_COUNT) - 1); bits_ld &= ((1 << IT8152_LD_IRQ_COUNT) - 1);
while (bits_ld) { while (bits_ld) {
i = __ffs(bits_pd); i = __ffs(bits_ld);
it8152_irq(IT8152_LD_IRQ(i)); it8152_irq(IT8152_LD_IRQ(i));
bits_ld &= ~(1 << i); bits_ld &= ~(1 << i);
} }

2
arch/arm/kernel/calls.S
View File

@ -336,7 +336,7 @@
CALL(sys_mknodat) CALL(sys_mknodat)
/* 325 */ CALL(sys_fchownat) /* 325 */ CALL(sys_fchownat)
CALL(sys_futimesat) CALL(sys_futimesat)
CALL(sys_fstatat64) CALL(ABI(sys_fstatat64, sys_oabi_fstatat64))
CALL(sys_unlinkat) CALL(sys_unlinkat)
CALL(sys_renameat) CALL(sys_renameat)
/* 330 */ CALL(sys_linkat) /* 330 */ CALL(sys_linkat)

24
arch/arm/kernel/sys_oabi-compat.c
View File

@ -25,6 +25,7 @@
* sys_stat64: * sys_stat64:
* sys_lstat64: * sys_lstat64:
* sys_fstat64: * sys_fstat64:
* sys_fstatat64:
* *
* struct stat64 has different sizes and some members are shifted * struct stat64 has different sizes and some members are shifted
* Compatibility wrappers are needed for them and provided below. * Compatibility wrappers are needed for them and provided below.
@ -169,6 +170,29 @@ asmlinkage long sys_oabi_fstat64(unsigned long fd,
return error; return error;
} }
asmlinkage long sys_oabi_fstatat64(int dfd,
char __user *filename,
struct oldabi_stat64 __user *statbuf,
int flag)
{
struct kstat stat;
int error = -EINVAL;
if ((flag & ~AT_SYMLINK_NOFOLLOW) != 0)
goto out;
if (flag & AT_SYMLINK_NOFOLLOW)
error = vfs_lstat_fd(dfd, filename, &stat);
else
error = vfs_stat_fd(dfd, filename, &stat);
if (!error)
error = cp_oldabi_stat64(&stat, statbuf);
out:
return error;
}
struct oabi_flock64 { struct oabi_flock64 {
short l_type; short l_type;
short l_whence; short l_whence;