Commit Graph

598 Commits

Author SHA1 Message Date
Brian Behlendorf 9974a98a5d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-03-08 13:48:15 -08:00
Brian Behlendorf 3d7cfde000 Remove Module.markers and Module.symver{s} in clean target
Split 'modules' and 'clean' Makefile targets to allow us to
cleanly remove the Module.* build products with a 'make clean'.
2010-03-08 13:45:51 -08:00
Brian Behlendorf 7121867aea Configure checks for kernel build options incompatible with the license
Changes for linux-kernel-module topic branch, see commit fd75782.
2010-03-08 10:45:19 -08:00
Brian Behlendorf 39d8b611e3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-01-08 11:39:52 -08:00
Brian Behlendorf 303d9f010d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-01-08 11:39:31 -08:00
Brian Behlendorf 6cb71e1dec Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2010-01-08 11:39:14 -08:00
Brian Behlendorf e69572c1b5 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2010-01-08 11:39:00 -08:00
Brian Behlendorf 69804965e9 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2010-01-08 11:39:00 -08:00
Brian Behlendorf 4cd8e49a69 Add .gitignore files to exclude build products 2010-01-08 11:35:17 -08:00
Brian Behlendorf 5b0a1c06d5 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-12-18 14:31:51 -08:00
Brian Behlendorf 93b5403a64 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-12-18 14:31:22 -08:00
Brian Behlendorf 1a36b0ada1 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-12-18 14:31:22 -08:00
Brian Behlendorf b58747a2e2 Merge branch 'fix-stack' into refs/top-bases/fix-branch 2009-12-18 14:31:21 -08:00
Brian Behlendorf 70ddc1393f No inline to keep dmu_recv_stream() stack frame less than 1024 bytes.
Recent builds against 2.6.31 flagged dmu_recv_stream() as stack heavy.
As a quick simple way to resolve this I'm preventing the inlining of
certain functions which gcc will inline here because this is the only
place they are called.  Futher analysis of this function should be
performed to futher reduce its stack usage.
2009-12-18 14:22:02 -08:00
Brian Behlendorf 8bc41ddf2e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-12-11 12:07:58 -08:00
Brian Behlendorf acd798cfd4 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-12-11 12:07:23 -08:00
Brian Behlendorf f8d093f69b Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-12-11 12:07:23 -08:00
Brian Behlendorf b76d12a644 Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch 2009-12-11 12:07:22 -08:00
Brian Behlendorf ba7ccf8ccd Cast to unsigned long long for 32-bit arches 2009-12-11 11:41:04 -08:00
Brian Behlendorf bc20ccb15c Revert just zfs_ioctl.c changes moved to linux-kernel-disk branch. 2009-11-20 10:55:19 -08:00
Brian Behlendorf 07cdadc1f8 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-20 10:30:27 -08:00
Brian Behlendorf cac1bc41dc Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-11-20 10:29:49 -08:00
Brian Behlendorf 77c347db31 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-11-20 10:29:48 -08:00
Brian Behlendorf 0f315a58bb Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-11-20 10:29:47 -08:00
Brian Behlendorf 0160d32326 Symbol spa_busy() not required in Linux port removing EXPORT_SYMBOL 2009-11-20 10:16:37 -08:00
Brian Behlendorf 3191b962f6 Prevent gcc uninit compiler warning in zfs_range_unlock_reader(). 2009-11-20 09:59:58 -08:00
Brian Behlendorf b6c57fe77e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-11-15 16:27:44 -08:00
Brian Behlendorf d00a0ea8a0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-11-15 16:27:02 -08:00
Brian Behlendorf b57e406dd6 Merge commit 'refs/top-bases/fix-stack' into fix-stack 2009-11-15 16:26:47 -08:00
Brian Behlendorf e57bf40c98 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2009-11-15 16:26:36 -08:00
Brian Behlendorf 00f3dfb5e9 Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-11-15 16:26:36 -08:00
Brian Behlendorf 59cbe87375 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-11-15 16:26:31 -08:00
Brian Behlendorf 4f9acff2d8 Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants 2009-11-15 16:26:20 -08:00
Brian Behlendorf 217998d1a3 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2009-11-15 16:26:12 -08:00
Brian Behlendorf d8aef5d7bc Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-11-15 16:25:52 -08:00
Brian Behlendorf 030d49c262 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-11-15 16:25:50 -08:00
Brian Behlendorf 0aa61e8427 Remove zvol.c when updating in update-zfs.sh Linux version available. 2009-11-15 16:20:01 -08:00
Brian Behlendorf 5bc2e9e592 Add spa_config_path module option for alternate cache file. 2009-10-06 12:17:38 -07:00
Brian Behlendorf 6e2c55b5a6 Update to use spl_module_{init,exit}() macro API. 2009-10-01 16:47:49 -07:00
Brian Behlendorf ad97c53c74 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-08-18 14:19:57 -07:00
Brian Behlendorf e4b55cfbff Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-18 14:18:36 -07:00
Brian Behlendorf 5d83878f46 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-08-18 14:18:34 -07:00
Brian Behlendorf ef74bed821 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2009-08-18 14:18:32 -07:00
Brian Behlendorf f3ddd9d082 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-08-18 14:18:32 -07:00
Brian Behlendorf 8767bb3fdd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-08-18 14:18:31 -07:00
Brian Behlendorf 218ddf3d52 Required build 121 updates for linux-kernel-module 2009-08-18 14:10:33 -07:00
Brian Behlendorf f9a74de46a Required build 121 updates for gcc-uninit 2009-08-18 14:09:35 -07:00
Brian Behlendorf 08f5b3c23d Required build 121 updates for gcc-shadow 2009-08-18 14:09:15 -07:00
Brian Behlendorf d42b88372f Required build 121 updates for gcc-c90 2009-08-18 14:07:25 -07:00
Brian Behlendorf 954484f75d Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
Conflicts:

	module/zfs/dsl_dataset.c
	module/zfs/spa_history.c
2009-08-18 12:32:53 -07:00