diff options
| author | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-05-13 16:42:29 -0400 |
|---|---|---|
| committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-05-13 16:42:29 -0400 |
| commit | 4b1126d2e422253999f071adcc05299c0172b45a (patch) | |
| tree | a90cc14dddf7fe0fde4616e4fbe2dd5b08572fc0 /litmus/dgl.c | |
| parent | 2d8f8176515f2516b9a0b85642a7b842eb53552b (diff) | |
Allow self conflicts
Diffstat (limited to 'litmus/dgl.c')
| -rw-r--r-- | litmus/dgl.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/litmus/dgl.c b/litmus/dgl.c index 0c1ce73868e3..dd2a42cc9ca6 100644 --- a/litmus/dgl.c +++ b/litmus/dgl.c | |||
| @@ -124,11 +124,8 @@ void set_req(struct dgl *dgl, struct dgl_group_req *greq, | |||
| 124 | int word, bit; | 124 | int word, bit; |
| 125 | struct dgl_req *req; | 125 | struct dgl_req *req; |
| 126 | 126 | ||
| 127 | BUG_ON(replicas > dgl->num_replicas); | 127 | if (replicas > dgl->num_replicas) |
| 128 | 128 | replicas = dgl->num_replicas; | |
| 129 | #ifndef CONFIG_NP_SECTION | ||
| 130 | BUG_ON(1); | ||
| 131 | #endif | ||
| 132 | 129 | ||
| 133 | mask_idx(resource, &word, &bit); | 130 | mask_idx(resource, &word, &bit); |
| 134 | __set_bit(bit, &greq->requested[word]); | 131 | __set_bit(bit, &greq->requested[word]); |