summaryrefslogtreecommitdiffstats
path: root/recipes-containers/runc/runc-docker/0003-Update-memory-specs-to-use-int64-not-uint64.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-containers/runc/runc-docker/0003-Update-memory-specs-to-use-int64-not-uint64.patch')
-rw-r--r--recipes-containers/runc/runc-docker/0003-Update-memory-specs-to-use-int64-not-uint64.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes-containers/runc/runc-docker/0003-Update-memory-specs-to-use-int64-not-uint64.patch b/recipes-containers/runc/runc-docker/0003-Update-memory-specs-to-use-int64-not-uint64.patch
index 9cb34922..50a9b7fc 100644
--- a/recipes-containers/runc/runc-docker/0003-Update-memory-specs-to-use-int64-not-uint64.patch
+++ b/recipes-containers/runc/runc-docker/0003-Update-memory-specs-to-use-int64-not-uint64.patch
@@ -20,8 +20,8 @@ Signed-off-by: Justin Cormack <justin.cormack@docker.com>
20 20
21diff --git a/libcontainer/cgroups/fs/memory.go b/libcontainer/cgroups/fs/memory.go 21diff --git a/libcontainer/cgroups/fs/memory.go b/libcontainer/cgroups/fs/memory.go
22index da2cc9f8..b739c631 100644 22index da2cc9f8..b739c631 100644
23--- a/libcontainer/cgroups/fs/memory.go 23--- a/src/import/libcontainer/cgroups/fs/memory.go
24+++ b/libcontainer/cgroups/fs/memory.go 24+++ b/src/import/libcontainer/cgroups/fs/memory.go
25@@ -73,14 +73,14 @@ func EnableKernelMemoryAccounting(path string) error { 25@@ -73,14 +73,14 @@ func EnableKernelMemoryAccounting(path string) error {
26 // until a limit is set on the cgroup and limit cannot be set once the 26 // until a limit is set on the cgroup and limit cannot be set once the
27 // cgroup has children, or if there are already tasks in the cgroup. 27 // cgroup has children, or if there are already tasks in the cgroup.
@@ -123,8 +123,8 @@ index da2cc9f8..b739c631 100644
123 } 123 }
124diff --git a/libcontainer/configs/cgroup_linux.go b/libcontainer/configs/cgroup_linux.go 124diff --git a/libcontainer/configs/cgroup_linux.go b/libcontainer/configs/cgroup_linux.go
125index 3e0509de..e15a662f 100644 125index 3e0509de..e15a662f 100644
126--- a/libcontainer/configs/cgroup_linux.go 126--- a/src/import/libcontainer/configs/cgroup_linux.go
127+++ b/libcontainer/configs/cgroup_linux.go 127+++ b/src/import/libcontainer/configs/cgroup_linux.go
128@@ -43,19 +43,19 @@ type Resources struct { 128@@ -43,19 +43,19 @@ type Resources struct {
129 Devices []*Device `json:"devices"` 129 Devices []*Device `json:"devices"`
130 130
@@ -152,8 +152,8 @@ index 3e0509de..e15a662f 100644
152 CpuShares uint64 `json:"cpu_shares"` 152 CpuShares uint64 `json:"cpu_shares"`
153diff --git a/update.go b/update.go 153diff --git a/update.go b/update.go
154index 0ea90d60..133be999 100644 154index 0ea90d60..133be999 100644
155--- a/update.go 155--- a/src/import/update.go
156+++ b/update.go 156+++ b/src/import/update.go
157@@ -124,11 +124,11 @@ other options are ignored. 157@@ -124,11 +124,11 @@ other options are ignored.
158 158
159 r := specs.LinuxResources{ 159 r := specs.LinuxResources{