c8982a94b4
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-05-22 16:38:02 -07:00
16627ea0a0
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-05-22 16:38:00 -07:00
a1c28ce918
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-05-22 16:37:55 -07:00
21ee362da7
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-05-22 16:37:53 -07:00
5451cf2515
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-05-22 16:37:47 -07:00
6ca7c06bc5
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-05-22 16:37:46 -07:00
cbcdc9784e
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-05-22 16:37:40 -07:00
536b930527
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-05-22 16:37:38 -07:00
cffd8ce4d3
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-05-22 16:37:33 -07:00
a0cbacda86
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-05-22 16:37:31 -07:00
df6c8453b0
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-05-22 16:37:30 -07:00
b3ff22fd38
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-05-22 16:37:21 -07:00
0cba0fc350
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-05-22 16:37:19 -07:00
40e75795ca
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-05-22 16:37:19 -07:00
24645dbd5f
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-05-22 16:37:09 -07:00
38350f860d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-05-22 16:37:07 -07:00
dff2ec2ef7
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-05-22 16:37:02 -07:00
f2f1b9fbbe
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-05-22 16:37:00 -07:00
c0d31a87ad
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-05-22 16:36:55 -07:00
4a2266c1d5
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-05-22 16:36:53 -07:00
fa393d3a7e
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-05-22 16:36:47 -07:00
300575508d
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-05-22 16:36:45 -07:00
584a46302b
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-05-22 16:36:40 -07:00
36e3534561
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-05-22 16:36:38 -07:00
012053790d
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-05-22 16:36:33 -07:00
30838b3f9b
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-05-22 16:36:31 -07:00
5451ee79e5
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
2009-05-22 16:36:26 -07:00
bbd93a7dd2
Merge commit 'refs/top-bases/linux-arc' into linux-arc
2009-05-22 16:36:24 -07:00
9c53917bd5
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-05-22 16:36:23 -07:00
e1d6e67473
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-05-22 16:36:23 -07:00
9c59a63d91
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-05-22 16:36:22 -07:00
e56aa929e8
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-05-22 16:36:22 -07:00
8e9605062a
Explictly use signed char for portability. On x86/x86_64
...
systems the default char type is signed, on ppc/ppc64 systems
the default char type is unsigned.
2009-05-22 16:30:47 -07:00
2486dd20e5
Set LP64 for powerpc64 and LP32 for just powerpc.
2009-05-22 16:27:59 -07:00
8bb2e455fb
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-05-22 15:07:27 -07:00
b83a638936
Powerpc64 Compatibility
...
- Add 64-bit user space atomic support obtained from an old version
of OpenSolaris which supported ppc. They are not all 100% fully
implemented by they are a good first step.
- Add powerpc ISA type.
- Strip out unused ISA defines to prevent any confusion.
2009-05-22 15:00:19 -07:00
9c2ba57a6d
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-05-22 14:57:16 -07:00
ca43d3b0af
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-05-22 14:57:15 -07:00
ab3d189dcf
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-05-22 14:57:10 -07:00
5e29e79180
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-05-22 14:57:08 -07:00
d48c126a99
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-05-22 14:57:03 -07:00
c6d2a0c159
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-05-22 14:57:01 -07:00
3d5d584d12
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-05-22 14:56:56 -07:00
4e8c5549c6
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-05-22 14:56:55 -07:00
864195b443
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-05-22 14:56:49 -07:00
b0f211b851
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-05-22 14:56:48 -07:00
0484f9776a
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-05-22 14:56:42 -07:00
c489c78bf0
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-05-22 14:56:41 -07:00
10ad896ed5
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-05-22 14:56:35 -07:00
14ca042c97
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-05-22 14:56:34 -07:00
Brian Behlendorf