Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 63056
b: refs/heads/master
c: 7a6c813
h: refs/heads/master
v: v3
  • Loading branch information
Tony Luck committed Jul 27, 2007
1 parent 25b9960 commit 9fb6ab1
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7091138fb762aed22317b4ff91eb211e7da3865c
refs/heads/master: 7a6c813594c9eb25a9afbcbd30c9865e38ee6f39
3 changes: 3 additions & 0 deletions trunk/arch/ia64/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,9 @@ config COMPAT
depends on IA32_SUPPORT
default y

config COMPAT_FOR_U64_ALIGNMENT
def_bool COMPAT

config IA64_MCA_RECOVERY
tristate "MCA recovery from errors other than TLB."

Expand Down
3 changes: 3 additions & 0 deletions trunk/arch/x86_64/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,9 @@ config COMPAT
depends on IA32_EMULATION
default y

config COMPAT_FOR_U64_ALIGNMENT
def_bool COMPAT

config SYSVIPC_COMPAT
bool
depends on COMPAT && SYSVIPC
Expand Down
2 changes: 1 addition & 1 deletion trunk/fs/quota.c
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ asmlinkage long sys_quotactl(unsigned int cmd, const char __user *special, qid_t
return ret;
}

#if defined(CONFIG_X86_64) || defined(CONFIG_IA64)
#if defined(CONFIG_COMPAT_FOR_U64_ALIGNMENT)
/*
* This code works only for 32 bit quota tools over 64 bit OS (x86_64, ia64)
* and is necessary due to alignment problems.
Expand Down

0 comments on commit 9fb6ab1

Please sign in to comment.