diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-12-04 19:43:39 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-12-04 19:43:39 +0000 |
| commit | 7c92d0889520b30bcffdbb0fb2edc143a0d6e3a9 (patch) | |
| tree | 8579b0127645f252cdce8258297bd784c09c5667 /usr/src/cmd/mdb/intel | |
| parent | 13fdcf71531411dde2cb67cc2db61767a9d77e18 (diff) | |
| parent | 08db0dbccad017e19ad23f4b307e9fd0dc96cda1 (diff) | |
| download | illumos-joyent-7c92d0889520b30bcffdbb0fb2edc143a0d6e3a9.tar.gz | |
[illumos-gate merge]
commit 08db0dbccad017e19ad23f4b307e9fd0dc96cda1
5377 bootadm update-archive misidentifies BEs as ramdisks
commit c1379625401dfbe1c39b79136dd384a571d47fde
5314 Remove "dbuf phys" db->db_data pointer aliases in ZFS
commit 2dc692e04c2d360aa723d8436a83b8f44e8fa77b
5340 add kstats to track reason for fork failures
commit 83ff55dcd7fc7c3356d7b2d3f67ec99970728d9b
5366 strcoll_l may destroy its arguments, then crash
Conflicts:
usr/src/uts/common/os/zone.c
usr/src/uts/common/os/lwp.c
usr/src/uts/common/os/fork.c
Diffstat (limited to 'usr/src/cmd/mdb/intel')
| -rw-r--r-- | usr/src/cmd/mdb/intel/amd64/libzpool/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/cmd/mdb/intel/amd64/zfs/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/cmd/mdb/intel/ia32/libzpool/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/cmd/mdb/intel/ia32/zfs/Makefile | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile b/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile index fa059da58b..8947c877c5 100644 --- a/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/libzpool/Makefile @@ -33,6 +33,7 @@ include ../../../../Makefile.cmd include ../../../../Makefile.cmd.64 include ../../Makefile.amd64 include ../../../Makefile.module +include ../../../common/modules/zfs/Makefile.zfs MODSRCS_DIR = ../../../common/modules/zfs GENUNIX_DIR = ../../../common/modules/genunix diff --git a/usr/src/cmd/mdb/intel/amd64/zfs/Makefile b/usr/src/cmd/mdb/intel/amd64/zfs/Makefile index 97a4a859c9..bae4d7f502 100644 --- a/usr/src/cmd/mdb/intel/amd64/zfs/Makefile +++ b/usr/src/cmd/mdb/intel/amd64/zfs/Makefile @@ -33,6 +33,7 @@ include ../../../../Makefile.cmd include ../../../../Makefile.cmd.64 include ../../Makefile.amd64 include ../../../Makefile.module +include ../../../common/modules/zfs/Makefile.zfs CPPFLAGS += -I../../../../../uts/common/fs/zfs diff --git a/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile b/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile index bb2758e83b..bd86114ad7 100644 --- a/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile +++ b/usr/src/cmd/mdb/intel/ia32/libzpool/Makefile @@ -32,6 +32,7 @@ MODSRCS = zfs.c list.c include ../../../../Makefile.cmd include ../../Makefile.ia32 include ../../../Makefile.module +include ../../../common/modules/zfs/Makefile.zfs MODSRCS_DIR = ../../../common/modules/zfs GENUNIX_DIR = ../../../common/modules/genunix diff --git a/usr/src/cmd/mdb/intel/ia32/zfs/Makefile b/usr/src/cmd/mdb/intel/ia32/zfs/Makefile index 8220aa4947..17ab63f959 100644 --- a/usr/src/cmd/mdb/intel/ia32/zfs/Makefile +++ b/usr/src/cmd/mdb/intel/ia32/zfs/Makefile @@ -32,6 +32,7 @@ MODSRCS = zfs.c include ../../../../Makefile.cmd include ../../Makefile.ia32 include ../../../Makefile.module +include ../../../common/modules/zfs/Makefile.zfs CPPFLAGS += -I../../../../../uts/common/fs/zfs |